geforkt von Mirrors/Paper
aa52bf9e33
Mojang made some changes to priorities in 1.17 and it seems that these changes conflict with the changes made in this patch, which in some cases appears to cause excessive rescheduling of tasks. This, however, is not confirmed as such but seems to be the behavior that we're seeing to cause this issue, if mojang has adopted the changes we suggested, then a good chunk of this patch may be unneeded, but, this needs a much better look than I'm currently able to do
23 Zeilen
1.3 KiB
Diff
23 Zeilen
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 f0a2e27c21b0fd9df236a0a145c7cbf37661fa7d..deade89dbbd1d4e548be7be1a46e36b7a9eff809 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -3702,6 +3702,7 @@ public abstract class LivingEntity extends Entity {
|
|
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();
|