mirror of https://github.com/PaperMC/Paper.git
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/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
index df0286a972dfa4e3b4c1898f8936062aaf3cdde6..541debdee83cbef985aafa0c3cb344a5bee18625 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();
|