[Bleeding] Fix stack overflow with Ender Crystals. Fixes BUKKIT-5583

This commit is contained in:
GJ 2014-05-01 08:47:25 -04:00 committed by Travis Watkins
parent 2bf22a9c49
commit 33e472229e

View File

@ -67,20 +67,20 @@ public class EntityEnderCrystal extends Entity {
this.b = 0; this.b = 0;
if (this.b <= 0) { if (this.b <= 0) {
// this.die(); // CraftBukkit - moved down this.die();
if (!this.world.isStatic) { if (!this.world.isStatic) {
// CraftBukkit start // CraftBukkit start
ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), 6.0F, false); ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), 6.0F, false);
this.world.getServer().getPluginManager().callEvent(event); this.world.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) { if (event.isCancelled()) {
this.dead = false;
return false; return false;
} }
this.world.createExplosion(this, this.locX, this.locY, this.locZ, event.getRadius(), event.getFire(), true); this.world.createExplosion(this, this.locX, this.locY, this.locZ, event.getRadius(), event.getFire(), true);
}
this.die();
// CraftBukkit end // CraftBukkit end
} }
} }
}
return true; return true;
} }