patches/server/0518-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 533b020ab103bf353be21ccc95954f8e827a89c6..bf5f8756555cc92d5b0a426400bf8fe8a834e96a 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3971,6 +3971,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();