1 files changed, 22 insertions, 0 deletions
diff --git a/patches/server/0571-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0571-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
new file mode 100644
index 0000000000..9fed251180
--- /dev/null
+++ b/patches/server/0571-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 002591d6cafd909783db95f000530d3b93a04ff6..9ce8052369e3279a89b55b56c476c1e1405c6570 100644
+--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+@@ -3857,6 +3857,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
+                             ((ServerPlayer) this).getBukkitEntity().updateInventory();
+                             ((ServerPlayer) this).getBukkitEntity().updateScaledHealth();