diff options
| author | Nassim Jahnke <[email protected]> | 2024-12-03 17:58:41 +0100 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2024-12-03 17:58:41 +0100 |
| commit | c0a3d51ab35930e410fcd9752ceaff6c3f581c24 (patch) | |
| tree | f53076a8b0787d2f544f73f468df94619e5eb1a5 /patches/server/0188-WitchConsumePotionEvent.patch | |
| parent | da7138233f6392e791d790d1c3407414c855f9c2 (diff) | |
| download | Paper-c0a3d51ab35930e410fcd9752ceaff6c3f581c24.tar.gz Paper-c0a3d51ab35930e410fcd9752ceaff6c3f581c24.zip | |
Start update, apply API patches
Diffstat (limited to 'patches/server/0188-WitchConsumePotionEvent.patch')
| -rw-r--r-- | patches/server/0188-WitchConsumePotionEvent.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/patches/server/0188-WitchConsumePotionEvent.patch b/patches/server/0188-WitchConsumePotionEvent.patch deleted file mode 100644 index d63befdcdb..0000000000 --- a/patches/server/0188-WitchConsumePotionEvent.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 4fe13665f298503d28d866551fa7871437ca683b..93cc6a6345d8b9c349eba8bc5ba3d23cb36d76cc 100644 ---- a/src/main/java/net/minecraft/world/entity/monster/Witch.java -+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java -@@ -124,6 +124,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 |