2021-06-11 12:02:28 +00:00
|
|
|
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
|
2022-07-03 21:55:56 +00:00
|
|
|
index 20816ccecd427ca747719dea5fd6c2d5544b71ff..85a0a295ce7739e340ada69e5a970b742dd95004 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
2022-06-08 08:00:56 +00:00
|
|
|
@@ -3752,6 +3752,7 @@ public abstract class LivingEntity extends Entity {
|
2021-11-24 22:26:32 +00:00
|
|
|
level.getCraftServer().getPluginManager().callEvent(event);
|
2021-06-11 12:02:28 +00:00
|
|
|
|
2021-11-24 22:26:32 +00:00
|
|
|
if (event.isCancelled()) {
|
2021-06-11 12:02:28 +00:00
|
|
|
+ this.stopUsingItem(); // Paper - event is using an item, clear active item to reset its use
|
2021-11-24 22:26:32 +00:00
|
|
|
// Update client
|
|
|
|
((ServerPlayer) this).getBukkitEntity().updateInventory();
|
|
|
|
((ServerPlayer) this).getBukkitEntity().updateScaledHealth();
|