Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 18:45:54 +01:00
Code Issues Projects Releases Wiki Activity

Improve damage handling of dead entities

Browse Source
This commit is contained in:
Phoenix616 2019-03-06 01:13:47 +01:00 committed by md_5
parent 1dbe87c8cc
commit 73597ed865
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nms-patches/EntityLiving.patch
View File

@ -492,6 +492,15 @@
}
}
@@ -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;