Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Upstream Paper

Browse Source
This commit is contained in:
Sotr
2019-03-07 12:42:37 +08:00
parent cadd3f71c0
commit 956e1fe461
8 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraft/server/EntityLiving.java
View File

@@ -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) { // 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;