From 8a5e72c95369dff6a259f5432406e7def5575d60 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Sun, 20 Mar 2016 13:40:12 +1100 Subject: [PATCH] SPIGOT-1991: Further damage fixes By: md_5 --- paper-server/nms-patches/EntityLiving.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/paper-server/nms-patches/EntityLiving.patch b/paper-server/nms-patches/EntityLiving.patch index 64db669a1f..c9a3e9d5de 100644 --- a/paper-server/nms-patches/EntityLiving.patch +++ b/paper-server/nms-patches/EntityLiving.patch @@ -489,11 +489,11 @@ this.getCombatTracker().trackDamage(damagesource, f2, f); - this.setAbsorptionHearts(this.getAbsorptionHearts() - f); + // CraftBukkit start -+ if (human) { -+ return true; ++ if (!human) { ++ this.setAbsorptionHearts(this.getAbsorptionHearts() - f); + } + // CraftBukkit end -+ this.setAbsorptionHearts(this.getAbsorptionHearts() - f); ++ return true; + } else { + return false; }