diff options
author | GJ <gjmcferrin@gmail.com> | 2014-05-01 08:47:25 -0400 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2014-05-03 10:59:32 -0500 |
commit | 33e472229ef8c9f36261c596ea3f2a896be0f8a5 (patch) | |
tree | bd9b98ac59f3737bc7a2143f3f7d72c77bf8a5db /src/main/java | |
parent | 2bf22a9c497f1a3dd8b52735128291338d145dc2 (diff) | |
download | craftbukkit-33e472229ef8c9f36261c596ea3f2a896be0f8a5.tar craftbukkit-33e472229ef8c9f36261c596ea3f2a896be0f8a5.tar.gz craftbukkit-33e472229ef8c9f36261c596ea3f2a896be0f8a5.tar.lz craftbukkit-33e472229ef8c9f36261c596ea3f2a896be0f8a5.tar.xz craftbukkit-33e472229ef8c9f36261c596ea3f2a896be0f8a5.zip |
[Bleeding] Fix stack overflow with Ender Crystals. Fixes BUKKIT-5583
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityEnderCrystal.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java index a542c9a1..aad400aa 100644 --- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java +++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java @@ -67,18 +67,18 @@ public class EntityEnderCrystal extends Entity { this.b = 0; if (this.b <= 0) { - // this.die(); // CraftBukkit - moved down + this.die(); if (!this.world.isStatic) { // CraftBukkit start ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), 6.0F, false); this.world.getServer().getPluginManager().callEvent(event); if (event.isCancelled()) { + this.dead = false; return false; } this.world.createExplosion(this, this.locX, this.locY, this.locZ, event.getRadius(), event.getFire(), true); + // CraftBukkit end } - this.die(); - // CraftBukkit end } } |