diff options
| author | md_5 <git@md-5.net> | 2016-07-30 10:06:07 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-07-30 10:06:07 +1000 |
| commit | 83a9dbdef609f7e8dfd4c0a5758be72fe732d8c9 (patch) | |
| tree | 7a95dc558e5baa9f2681eb33e3f05ba81b1cc708 /src | |
| parent | 8cc595840485d239132e33f9e454bbf524a44826 (diff) | |
| download | craftbukkit-83a9dbdef609f7e8dfd4c0a5758be72fe732d8c9.tar craftbukkit-83a9dbdef609f7e8dfd4c0a5758be72fe732d8c9.tar.gz craftbukkit-83a9dbdef609f7e8dfd4c0a5758be72fe732d8c9.tar.lz craftbukkit-83a9dbdef609f7e8dfd4c0a5758be72fe732d8c9.tar.xz craftbukkit-83a9dbdef609f7e8dfd4c0a5758be72fe732d8c9.zip | |
SPIGOT-2559: Kill all entities when called with setHealth(0)
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java index e662e4ae..feef438c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -95,8 +95,8 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth()); } - if (entity instanceof EntityPlayer && health == 0) { - ((EntityPlayer) entity).die(DamageSource.GENERIC); + if (health == 0) { + getHandle().die(DamageSource.GENERIC); } getHandle().setHealth((float) health); |