diff options
| author | md_5 <git@md-5.net> | 2016-03-20 13:40:12 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-03-20 13:40:12 +1100 |
| commit | 549962feaf4e17b1eab1092fe4d5a61ca5b13b59 (patch) | |
| tree | 06331b46185795a97a261f84fcfb281b600e3351 /nms-patches | |
| parent | b3f6de0da51ba476bb6792f6fdf44cec472d3cce (diff) | |
| download | craftbukkit-549962feaf4e17b1eab1092fe4d5a61ca5b13b59.tar craftbukkit-549962feaf4e17b1eab1092fe4d5a61ca5b13b59.tar.gz craftbukkit-549962feaf4e17b1eab1092fe4d5a61ca5b13b59.tar.lz craftbukkit-549962feaf4e17b1eab1092fe4d5a61ca5b13b59.tar.xz craftbukkit-549962feaf4e17b1eab1092fe4d5a61ca5b13b59.zip | |
SPIGOT-1991: Further damage fixes
Diffstat (limited to 'nms-patches')
| -rw-r--r-- | nms-patches/EntityLiving.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/EntityLiving.patch b/nms-patches/EntityLiving.patch index 64db669a..c9a3e9d5 100644 --- a/nms-patches/EntityLiving.patch +++ b/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; } |