diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityEnderCrystal.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityEnderCrystal.java | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java index 410fc289..f3395b44 100644 --- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java +++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java @@ -46,22 +46,26 @@ public class EntityEnderCrystal extends Entity { } public boolean damageEntity(DamageSource damagesource, int i) { - if (!this.dead && !this.world.isStatic) { - // CraftBukkit start - All non-living entities need this - if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, i)) { - return false; - } - // CraftBukkit end + if (this.isInvulnerable()) { + return false; + } else { + if (!this.dead && !this.world.isStatic) { + // CraftBukkit start - All non-living entities need this + if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, i)) { + return false; + } + // CraftBukkit end - this.b = 0; - if (this.b <= 0) { - this.die(); - if (!this.world.isStatic) { - this.world.explode(this, this.locX, this.locY, this.locZ, 6.0F, true); // CraftBukkit - (Entity) null -> this + this.b = 0; + if (this.b <= 0) { + this.die(); + if (!this.world.isStatic) { + this.world.explode(this, this.locX, this.locY, this.locZ, 6.0F, true); // CraftBukkit - (Entity) null -> this + } } } - } - return true; + return true; + } } } |