WitchReadyPotionEvent

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);
  

paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java

@@ -1974,4 +1974,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
 }