1 files changed, 42 insertions, 0 deletions
diff --git a/patches/server/0194-WitchReadyPotionEvent.patch b/patches/server/0194-WitchReadyPotionEvent.patch
new file mode 100644
index 0000000000..0e12aa1c8a
--- /dev/null
+++ b/patches/server/0194-WitchReadyPotionEvent.patch
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Tue, 5 Jun 2018 22:47:26 -0400
+Subject: [PATCH] WitchReadyPotionEvent
+
+
+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 c7470a5b95ee25078296c0443630c88a371b8a6f..d286239d02b81624124c4e32ff4413bbac902d54 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
++++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
+@@ -150,7 +150,11 @@ public class Witch extends Raider implements RangedAttackMob {
+                 }
+ 
+                 if (holder != null) {
+-                    this.setItemSlot(EquipmentSlot.MAINHAND, PotionContents.createItemStack(Items.POTION, holder));
++                    // Paper start
++                    ItemStack potion = PotionContents.createItemStack(Items.POTION, holder);
++                    potion = org.bukkit.craftbukkit.event.CraftEventFactory.handleWitchReadyPotionEvent(this, potion);
++                    this.setItemSlot(EquipmentSlot.MAINHAND, potion);
++                    // Paper end
+                     this.usingTime = this.getMainHandItem().getUseDuration();
+                     this.setUsingItem(true);
+                     if (!this.isSilent()) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index a49abc180f76cb7aeb6eda86998acd00e9d3fdee..d4c44ff13f657343ec19de5e6cef7639330a5e88 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -1899,4 +1899,14 @@ public class CraftEventFactory {
+         ).callEvent();
+     }
+     // Paper end - PlayerUseUnknownEntityEvent
++
++    // Paper start - WitchReadyPotionEvent
++    public static ItemStack handleWitchReadyPotionEvent(net.minecraft.world.entity.monster.Witch witch, @Nullable ItemStack potion) {
++        com.destroystokyo.paper.event.entity.WitchReadyPotionEvent event = new com.destroystokyo.paper.event.entity.WitchReadyPotionEvent((org.bukkit.entity.Witch) witch.getBukkitEntity(), CraftItemStack.asCraftMirror(potion));
++        if (!event.callEvent() || event.getPotion() == null) {
++            return ItemStack.EMPTY;
++        }
++        return org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getPotion());
++    }
++    // Paper end - WitchReadyPotionEvent
+ }