diff options
| author | Spottedleaf <[email protected]> | 2024-07-17 10:24:53 -0700 |
|---|---|---|
| committer | Spottedleaf <[email protected]> | 2024-07-17 10:28:32 -0700 |
| commit | 00b949f1bbbf444e2b5e7b8de7c9b14fbd2133c6 (patch) | |
| tree | 82639515bc5e9ae00c1e639e72137ed51e1ac688 /patches/server/0190-WitchConsumePotionEvent.patch | |
| parent | 967f98aa81da851740aeb429778e46159fd188df (diff) | |
| download | Paper-00b949f1bbbf444e2b5e7b8de7c9b14fbd2133c6.tar.gz Paper-00b949f1bbbf444e2b5e7b8de7c9b14fbd2133c6.zip | |
Remove Moonrise utils to MCUtils, remove duplicated/unused utils
Diffstat (limited to 'patches/server/0190-WitchConsumePotionEvent.patch')
| -rw-r--r-- | patches/server/0190-WitchConsumePotionEvent.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/patches/server/0190-WitchConsumePotionEvent.patch b/patches/server/0190-WitchConsumePotionEvent.patch new file mode 100644 index 0000000000..fead120a99 --- /dev/null +++ b/patches/server/0190-WitchConsumePotionEvent.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Aikar <[email protected]> +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 +index a4d10409f06316ee628b683b231b3cc2a08bf593..f9cd71379a1d195731e7348ac6928372a4b2c29c 100644 +--- a/src/main/java/net/minecraft/world/entity/monster/Witch.java ++++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java +@@ -123,6 +123,12 @@ public class Witch extends Raider implements RangedAttackMob { + + this.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY); + PotionContents potioncontents = (PotionContents) itemstack.get(DataComponents.POTION_CONTENTS); ++ // Paper start - WitchConsumePotionEvent ++ if (itemstack.is(Items.POTION)) { ++ 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)); ++ potioncontents = event.callEvent() ? org.bukkit.craftbukkit.inventory.CraftItemStack.unwrap(event.getPotion()).get(DataComponents.POTION_CONTENTS) : null; ++ } ++ // Paper end - WitchConsumePotionEvent + + if (itemstack.is(Items.POTION) && potioncontents != null) { + potioncontents.forEachEffect((effect) -> this.addEffect(effect, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ATTACK)); // CraftBukkit |