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 bd5825c5b5c81e0694a3635b981588f0d2ba83cb..3357ae0a3907f41dfd9a7f373e1c0b9643de498d 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1507,12 +1507,12 @@ public abstract class LivingEntity extends Entity { } } - EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity()); + EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), true); event.setCancelled(itemstack == null); this.level.getCraftServer().getPluginManager().callEvent(event); if (!event.isCancelled()) { - if (!itemstack1.isEmpty()) { + if (!itemstack1.isEmpty() && event.isShrink()) { itemstack1.shrink(1); } if (itemstack != null && this instanceof ServerPlayer) { @@ -4343,3 +4343,4 @@ public abstract class LivingEntity extends Entity { // CraftBukkit end } } +