From 33e472229ef8c9f36261c596ea3f2a896be0f8a5 Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Thu, 1 May 2014 08:47:25 -0400
Subject: [Bleeding] Fix stack overflow with Ender Crystals. Fixes BUKKIT-5583

---
 src/main/java/net/minecraft/server/EntityEnderCrystal.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

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
                 }
             }
 
-- 
cgit v1.2.3