spigot-mirror/craftbukkit
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/craftbukkit.git synced 2025-09-18 21:54:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SPIGOT-1991: Further damage fixes

Browse source
This commit is contained in:
md_5 2016-03-20 13:40:12 +11:00
parent b3f6de0da5
commit 549962feaf
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nms-patches/EntityLiving.patch
View file

@ -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;
}