From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Wed, 30 Mar 2022 08:58:45 +0000 Subject: [PATCH] Add isShrink to EntityResurrectEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java index a0f6d383b430c8e320f041fe2221943830b021eb..98df8261434739e3648b4b1e473606921c9a27c6 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1662,12 +1662,12 @@ public abstract class LivingEntity extends Entity implements Attackable { } org.bukkit.inventory.EquipmentSlot handSlot = (hand != null) ? org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand) : null; - EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), handSlot); + EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), handSlot, true); // Leaves - can dont shrink event.setCancelled(itemstack == null); this.level().getCraftServer().getPluginManager().callEvent(event); if (!event.isCancelled()) { - if (!itemstack1.isEmpty() && itemstack != null) { // Paper - only reduce item if actual totem was found + if (!itemstack1.isEmpty() && itemstack != null && event.isShrink()) { // Paper - only reduce item if actual totem was found // Leaves - can dont shrink itemstack1.shrink(1); } if (itemstack != null && this instanceof ServerPlayer) { @@ -4666,3 +4666,4 @@ public abstract class LivingEntity extends Entity implements Attackable { } } +