geforkt von Mirrors/Paper
25 Zeilen
1.8 KiB
Diff
25 Zeilen
1.8 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
Date: Wed, 16 May 2018 20:35:16 -0400
|
||
|
|
Subject: [PATCH] WitchConsumePotionEvent
|
||
|
|
|
||
|
|
Fires when a witch consumes the potion in their hand
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
|
||
|
|
index a64727fa7159f3e95f4eb44f02cb836f169b9b92..3e070a61a3099601e57d70ec663c4c6fb291c024 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
|
||
|
|
@@ -122,6 +122,12 @@ public class Witch extends Raider implements RangedAttackMob {
|
||
|
|
|
||
|
|
this.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
|
||
|
|
PotionContents potioncontents = (PotionContents) itemstack.get(DataComponents.POTION_CONTENTS);
|
||
|
|
+ // Paper start - WitchConsumePotionEvent
|
||
|
|
+ if (itemstack.is(Items.POTION)) {
|
||
|
|
+ com.destroystokyo.paper.event.entity.WitchConsumePotionEvent event = new com.destroystokyo.paper.event.entity.WitchConsumePotionEvent((org.bukkit.entity.Witch) this.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack));
|
||
|
|
+ potioncontents = event.callEvent() ? org.bukkit.craftbukkit.inventory.CraftItemStack.unwrap(event.getPotion()).get(DataComponents.POTION_CONTENTS) : null;
|
||
|
|
+ }
|
||
|
|
+ // Paper end - WitchConsumePotionEvent
|
||
|
|
|
||
|
|
if (itemstack.is(Items.POTION) && potioncontents != null) {
|
||
|
|
potioncontents.forEachEffect((effect) -> this.addEffect(effect, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ATTACK)); // CraftBukkit
|