diff options
Diffstat (limited to 'patches/server/0507-Fix-PlayerItemConsumeEvent-cancelling-properly.patch')
-rw-r--r-- | patches/server/0507-Fix-PlayerItemConsumeEvent-cancelling-properly.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/patches/server/0507-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0507-Fix-PlayerItemConsumeEvent-cancelling-properly.patch new file mode 100644 index 0000000000..a47593aa71 --- /dev/null +++ b/patches/server/0507-Fix-PlayerItemConsumeEvent-cancelling-properly.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: chickeneer <[email protected]> +Date: Fri, 19 Mar 2021 00:33:15 -0500 +Subject: [PATCH] Fix PlayerItemConsumeEvent cancelling properly + +When the active item is not cleared, the item is still readied +for use and will repeatedly trigger the PlayerItemConsumeEvent +till their item is switched. +This patch clears the active item when the event is cancelled + +diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java +index a89c6ba4140f15e7f68f0df5cf64a176d350123b..afa2d3f5199fcac5c83639bb87e31425da4c5310 100644 +--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java ++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +@@ -4011,6 +4011,7 @@ public abstract class LivingEntity extends Entity implements Attackable { + this.level().getCraftServer().getPluginManager().callEvent(event); + + if (event.isCancelled()) { ++ this.stopUsingItem(); // Paper - event is using an item, clear active item to reset its use + // Update client + if (this.useItem.getItem() instanceof net.minecraft.world.item.SuspiciousStewItem itemSuspiciousStew) { + itemSuspiciousStew.cancelUsingItem(entityPlayer, this.useItem); |