diff options
Diffstat (limited to 'patches/server/0838-Correctly-shrink-items-during-EntityResurrectEvent.patch')
| -rw-r--r-- | patches/server/0838-Correctly-shrink-items-during-EntityResurrectEvent.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/patches/server/0838-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0838-Correctly-shrink-items-during-EntityResurrectEvent.patch new file mode 100644 index 0000000000..6aeabf242c --- /dev/null +++ b/patches/server/0838-Correctly-shrink-items-during-EntityResurrectEvent.patch @@ -0,0 +1,36 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Bjarne Koll <[email protected]> +Date: Tue, 10 Jan 2023 21:06:42 +0100 +Subject: [PATCH] Correctly shrink items during EntityResurrectEvent + +The EntityResurrectEvent logic is supposed to locate a totem of undying +in any of the interaction slots of the player inventory and then, if the +called EntityResurrectEvent is not cancelled, shrink that item by 1, +usually reducing it to zero. + +For this, the logic iterates over the items in the interaction slots and +breaks out the loop if a totem of undying was found. +However, even if no totem of undying was found, the iteration item stack +variable remains as a refernce to the last interaction slot probed. + +Plugins uncancelling a EntityResurrectEvent, which is published +pre-cancelled to listeners if no totem of undying could be found, +would hence cause the server logic to shrink completely unrelated items +found in, at the writing of this patch, the players off hand slot. + +This patch corrects this behaviour by only shrinking the item if a totem +of undying was found and the event was called uncancelled. + +diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java +index 8e6cb47ce314d4c493047fa1804b2da8c9797fac..d9f9a184e22bc02fbfd1ab029abf48af654c9935 100644 +--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java ++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +@@ -1618,7 +1618,7 @@ public abstract class LivingEntity extends Entity implements Attackable { + this.level().getCraftServer().getPluginManager().callEvent(event); + + if (!event.isCancelled()) { +- if (!itemstack1.isEmpty()) { ++ if (!itemstack1.isEmpty() && itemstack != null) { // Paper - only reduce item if actual totem was found + itemstack1.shrink(1); + } + if (itemstack != null && this instanceof ServerPlayer) { |