From a43d621c0138110d2ec362b2eaa8f938f241bb49 Mon Sep 17 00:00:00 2001
From: feildmaster <admin@feildmaster.com>
Date: Sun, 29 Jul 2012 02:33:13 -0500
Subject: Update CraftBukkit to Minecraft 1.3.1

---
 .../net/minecraft/server/EntityEnderCrystal.java   | 29 +++++++++++-----------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'src/main/java/net/minecraft/server/EntityEnderCrystal.java')

diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
index a137ba03..641dc654 100644
--- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java
+++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
@@ -7,22 +7,22 @@ public class EntityEnderCrystal extends Entity {
 
     public EntityEnderCrystal(World world) {
         super(world);
-        this.bf = true;
-        this.b(2.0F, 2.0F);
+        this.m = true;
+        this.a(2.0F, 2.0F);
         this.height = this.length / 2.0F;
         this.b = 5;
         this.a = this.random.nextInt(100000);
     }
 
-    protected boolean g_() {
+    protected boolean e_() {
         return false;
     }
 
-    protected void b() {
+    protected void a() {
         this.datawatcher.a(8, Integer.valueOf(this.b));
     }
 
-    public void F_() {
+    public void h_() {
         this.lastX = this.locX;
         this.lastY = this.locY;
         this.lastZ = this.locZ;
@@ -41,24 +41,23 @@ public class EntityEnderCrystal extends Entity {
 
     protected void a(NBTTagCompound nbttagcompound) {}
 
-    public boolean o_() {
+    public boolean L() {
         return true;
     }
 
     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
+
             this.b = 0;
             if (this.b <= 0) {
+                this.die();
                 if (!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.die();
-                    this.world.explode(this, this.locX, this.locY, this.locZ, 6.0F); // CraftBukkit - (Entity) null -> this.
-                } else {
-                    this.die();
+                    this.world.explode(this, this.locX, this.locY, this.locZ, 6.0F); // CraftBukkit - (Entity) null -> this
                 }
             }
         }
-- 
cgit v1.2.3