mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 22:13:42 +01:00
25 lines
1.5 KiB
Diff
25 lines
1.5 KiB
Diff
|
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/EntityWitch.java b/src/main/java/net/minecraft/world/entity/monster/EntityWitch.java
|
||
|
|
index 814ef118e983ee6807108b2e07cd9b35ef9dae15..0bfdcbe4a792e8243de86ded6c64d930ec6e4de8 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/EntityWitch.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/EntityWitch.java
|
||
|
|
@@ -124,7 +124,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
|
||
|
|
|
||
|
|
this.setSlot(EnumItemSlot.MAINHAND, ItemStack.b);
|
||
|
|
if (itemstack.getItem() == Items.POTION) {
|
||
|
|
- List<MobEffect> 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<MobEffect> list = event.callEvent() ? PotionUtil.getEffects(org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getPotion())) : null;
|
||
|
|
+ // Paper end
|
||
|
|
|
||
|
|
if (list != null) {
|
||
|
|
Iterator iterator = list.iterator();
|