patches/server/0602-Fix-PlayerItemConsumeEvent-cancelling-properly.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: chickeneer <emcchickeneer@gmail.com>
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 f774d25eaaa1b7966b16251619da80a2d5c9228c..d427cd90177b14062ea56dcf6fa5fedddcdbb624 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3777,6 +3777,7 @@ public abstract class LivingEntity extends Entity {
                         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();