From 0b90741c3f8993501b3bfff0bb6f943f4d14fc33 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Wed, 7 Jul 2021 03:04:34 -0700
Subject: [PATCH] Move log message for named entity deaths into correct
 location (#6105)

---
 patches/server/Improve-death-events.patch | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/patches/server/Improve-death-events.patch b/patches/server/Improve-death-events.patch
index e5fceebc3b..ef45cfc4dd 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);