mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-24 13:30:48 +01:00
parent
42b4fbf53f
commit
2ca0bd1368
1 changed files with 22 additions and 0 deletions
|
@ -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();
|
Loading…
Add table
Reference in a new issue