From 2c9924816fa690b0d35bda1f4d436f8981ebe7a1 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Wed, 6 Mar 2019 00:00:34 -0500 Subject: [PATCH] Improve damage handling of dead entities Manually applied because of upstream patch file issues. Upstream 73597ed865e92dbfad404b69eb6468fb7e129ad2 --- ...ove-damage-handling-of-dead-entities.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Spigot-Server-Patches/0425-Improve-damage-handling-of-dead-entities.patch diff --git a/Spigot-Server-Patches/0425-Improve-damage-handling-of-dead-entities.patch b/Spigot-Server-Patches/0425-Improve-damage-handling-of-dead-entities.patch new file mode 100644 index 0000000000..658e400de0 --- /dev/null +++ b/Spigot-Server-Patches/0425-Improve-damage-handling-of-dead-entities.patch @@ -0,0 +1,24 @@ +From 09f9a46e3529faa5dbb60fe39812ed30f2759f71 Mon Sep 17 00:00:00 2001 +From: Phoenix616 +Date: Tue, 5 Mar 2019 23:57:38 -0500 +Subject: [PATCH] Improve damage handling of dead entities + +Manual application of 73597ed865e92dbfad404b69eb6468fb7e129ad2 until the +upstream patch file is sorted out. + +diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java +index b4f21171..77ea0ec4 100644 +--- a/src/main/java/net/minecraft/server/EntityLiving.java ++++ b/src/main/java/net/minecraft/server/EntityLiving.java +@@ -939,7 +939,7 @@ public abstract class EntityLiving extends Entity { + 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) { // Paper // 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; +-- +2.21.0 +