WitchReadyPotionEvent

2018-06-05 22:47:26 -04:00 · 2018-06-05 22:47:26 -04:00 · b64e7f96d3
commit b64e7f96d3
parent a3b5f969ed
2 changed files with 24 additions and 1 deletions
--- a/paper-server/patches/sources/net/minecraft/world/entity/monster/Witch.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/monster/Witch.java.patch
@ -17,7 +17,20 @@
                     }
 
                     this.gameEvent(GameEvent.DRINK);
-@@ -231,6 +237,13 @@
+@@ -146,7 +152,11 @@
+                 }
+ 
+                 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);
+                     this.setUsingItem(true);
+                     if (!this.isSilent()) {
+@@ -231,6 +241,13 @@
                 ServerLevel worldserver = (ServerLevel) world;
                 ItemStack itemstack = PotionContents.createItemStack(Items.SPLASH_POTION, holder);