13
0
geforkt von Mirrors/Paper

Fix PlayerItemConsumeEvent cancelling (fixes #4682) (#5383)

Dieser Commit ist enthalten in:
chickeneer 2021-04-17 01:54:49 -05:00
Ursprung 42b4fbf53f
Commit 2ca0bd1368

Datei anzeigen

@ -0,0 +1,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/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
world.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
+ this.clearActiveItem(); // Paper - event is using an item, clear active item to reset its use
// Update client
((EntityPlayer) this).getBukkitEntity().updateInventory();
((EntityPlayer) this).getBukkitEntity().updateScaledHealth();