diff --git a/paper-server/nms-patches/EntityLiving.patch b/paper-server/nms-patches/EntityLiving.patch
index 3b06b97633..2e7147d37b 100644
--- a/paper-server/nms-patches/EntityLiving.patch
+++ b/paper-server/nms-patches/EntityLiving.patch
@@ -375,6 +375,15 @@
          this.datawatcher.set(EntityLiving.HEALTH, MathHelper.a(f, 0.0F, this.getMaxHealth()));
      }
  
+@@ -703,7 +903,7 @@
+             return false;
+         } else if (this.world.isClientSide) {
+             return false;
+-        } else if (this.getHealth() <= 0.0F) {
++        } else if (this.dead || this.killed || this.getHealth() <= 0.0F) { // CraftBukkit - Don't allow entities that got set to dead/killed elsewhere to get damaged and die
+             return false;
+         } else if (damagesource.p() && this.hasEffect(MobEffects.FIRE_RESISTANCE)) {
+             return false;
 @@ -711,15 +911,17 @@
              this.ticksFarFromPlayer = 0;
              float f1 = f;
@@ -492,15 +501,6 @@
          }
      }
  
-@@ -703,7 +903,7 @@
-             return false;
-         } else if (this.world.isClientSide) {
-             return false;
--        } else if (this.getHealth() <= 0.0F) {
-+        } else if (this.dead || this.killed || this.getHealth() <= 0.0F) { // CraftBukkit - Don't allow entities that got set to dead/killed elsewhere to get damaged and die
-             return false;
-         } else if (damagesource.p() && this.hasEffect(MobEffects.FIRE_RESISTANCE)) {
-             return false;
 @@ -958,6 +1191,12 @@
                      boolean flag = this.lastDamageByPlayerTime > 0;