mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-24 08:06:41 +01:00
23 lines
1.3 KiB
Diff
23 lines
1.3 KiB
Diff
|
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 78d874c44cf8311af06b085db12fbe0cacd6cf7d..2657dd71213455e2da3a4ff4d338a33896ffe855 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||
|
|
@@ -3351,6 +3351,7 @@ 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();
|