diff --git a/patches/server/Improve-death-events.patch b/patches/server/Improve-death-events.patch index e5fceebc3..ef45cfc4d 100644 --- a/patches/server/Improve-death-events.patch +++ b/patches/server/Improve-death-events.patch @@ -109,15 +109,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 entityliving.awardKillScore(this, this.deathScore, source); } @@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity { - if (this.isSleeping()) { - this.stopSleeping(); - } -+ */ // Paper - move down to make death event cancellable - this is the runKillTrigger below -+ - if (!this.level.isClientSide && this.hasCustomName()) { LivingEntity.LOGGER.info("Named entity {} died: {}", this, this.getCombatTracker().getDeathMessage().getString()); } ++ */ // Paper - move down to make death event cancellable - this is the runKillTrigger below this.dead = true; - this.getCombatTracker().recheckStatus(); @@ -140,6 +135,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + this.stopSleeping(); + } + ++ if (!this.level.isClientSide && this.hasCustomName()) { ++ LivingEntity.LOGGER.info("Named entity {} died: {}", this, this.getCombatTracker().getDeathMessage().getString()); ++ } ++ + this.getCombatTracker().recheckStatus(); + if (entity != null) { + entity.killed((ServerLevel) this.level, this);