2018-10-05 05:18:46 +02:00
|
|
|
From c9d947db8035e9549431d25f17b33764b0653fc3 Mon Sep 17 00:00:00 2001
|
2018-05-17 02:35:33 +02:00
|
|
|
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/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
|
2018-08-26 20:11:49 +02:00
|
|
|
index a586689acf..6717d3c331 100644
|
2018-05-17 02:35:33 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityWitch.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityWitch.java
|
2018-07-19 01:16:19 +02:00
|
|
|
@@ -67,7 +67,11 @@ public class EntityWitch extends EntityMonster implements IRangedEntity {
|
2018-05-17 02:35:33 +02:00
|
|
|
|
|
|
|
this.setSlot(EnumItemSlot.MAINHAND, ItemStack.a);
|
|
|
|
if (itemstack.getItem() == Items.POTION) {
|
|
|
|
- List list = PotionUtil.getEffects(itemstack);
|
|
|
|
+ // Paper start
|
|
|
|
+ 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));
|
|
|
|
+
|
|
|
|
+ List list = event.callEvent() ? PotionUtil.getEffects(org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getPotion())) : null;
|
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
if (list != null) {
|
|
|
|
Iterator iterator = list.iterator();
|
|
|
|
--
|
2018-09-29 01:31:59 +02:00
|
|
|
2.19.0
|
2018-05-17 02:35:33 +02:00
|
|
|
|