diff options
Diffstat (limited to 'patches/server/0071-Custom-replacement-for-eaten-items.patch')
| -rw-r--r-- | patches/server/0071-Custom-replacement-for-eaten-items.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/patches/server/0071-Custom-replacement-for-eaten-items.patch b/patches/server/0071-Custom-replacement-for-eaten-items.patch index f241818165..62f3354374 100644 --- a/patches/server/0071-Custom-replacement-for-eaten-items.patch +++ b/patches/server/0071-Custom-replacement-for-eaten-items.patch @@ -5,22 +5,23 @@ Subject: [PATCH] Custom replacement for eaten items diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 4e192c98b7beb23ac75b7442883eba7bb98dc475..5678461976a07f9afecccb1d34ea3eec24fba80e 100644 +index f513e9abb929fbabe12e40bb56af708745ea1ad9..d038c65e8a3d4a0000465e9d3ac7c4915b1b1015 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3611,9 +3611,10 @@ public abstract class LivingEntity extends Entity { +@@ -3614,10 +3614,11 @@ public abstract class LivingEntity extends Entity { this.triggerItemUseEffects(this.useItem, 16); // CraftBukkit start - fire PlayerItemConsumeEvent ItemStack itemstack; -+ PlayerItemConsumeEvent event = null; // Paper ++ PlayerItemConsumeEvent event = null; // Paper if (this instanceof ServerPlayer) { org.bukkit.inventory.ItemStack craftItem = CraftItemStack.asBukkitCopy(this.useItem); -- PlayerItemConsumeEvent event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem); -+ event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem); // Paper + org.bukkit.inventory.EquipmentSlot hand = org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(enumhand); +- PlayerItemConsumeEvent event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem, hand); ++ event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem, hand); // Paper level.getCraftServer().getPluginManager().callEvent(event); if (event.isCancelled()) { -@@ -3627,6 +3628,13 @@ public abstract class LivingEntity extends Entity { +@@ -3631,6 +3632,13 @@ public abstract class LivingEntity extends Entity { } else { itemstack = this.useItem.finishUsingItem(this.level, this); } @@ -34,7 +35,7 @@ index 4e192c98b7beb23ac75b7442883eba7bb98dc475..5678461976a07f9afecccb1d34ea3eec // CraftBukkit end if (itemstack != this.useItem) { -@@ -3634,6 +3642,11 @@ public abstract class LivingEntity extends Entity { +@@ -3638,6 +3646,11 @@ public abstract class LivingEntity extends Entity { } this.stopUsingItem(); |