2021-06-11 12:02:28 +00:00
|
|
|
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
|
2021-06-12 19:30:37 +00:00
|
|
|
index 0c04665c6e2f5624e21e269d706fea842d54cefd..ecb3843ff3b4f0034f6aaa16cfc09cbd046d9008 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
|
|
|
|
|
@@ -124,7 +124,11 @@ public class Witch extends Raider implements RangedAttackMob {
|
|
|
|
|
|
|
|
|
|
this.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
|
2021-06-12 19:30:37 +00:00
|
|
|
if (itemstack.is(Items.POTION)) {
|
2021-06-11 12:02:28 +00:00
|
|
|
- List<MobEffectInstance> list = PotionUtils.getMobEffects(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<MobEffectInstance> list = event.callEvent() ? PotionUtils.getMobEffects(org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getPotion())) : null;
|
|
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
|
|
if (list != null) {
|
|
|
|
|
Iterator iterator = list.iterator();
|
