BUKKIT-57 Fix using Bukkit interface instead of nmc Entity for type check.

Thanks nidefawl!

2 files changed, 253 insertions, 1 deletions

diff --git a/src/main/java/net/minecraft/server/EntityAnimal.java b/src/main/java/net/minecraft/server/EntityAnimal.java
new file mode 100644
index 00000000..49d092b3
--- /dev/null
+++ b/src/main/java/net/minecraft/server/EntityAnimal.java
@@ -0,0 +1,252 @@
+package net.minecraft.server;
+
+import java.util.List;
+
+public abstract class EntityAnimal extends EntityCreature implements IAnimal {
+
+    private int love;
+    private int b = 0;
+
+    public EntityAnimal(World world) {
+        super(world);
+    }
+
+    protected void b() {
+        super.b();
+        this.datawatcher.a(12, new Integer(0));
+    }
+
+    public int getAge() {
+        return this.datawatcher.getInt(12);
+    }
+
+    public void setAge(int i) {
+        this.datawatcher.watch(12, Integer.valueOf(i));
+    }
+
+    public void d() {
+        super.d();
+        int i = this.getAge();
+
+        if (i < 0) {
+            ++i;
+            this.setAge(i);
+        } else if (i > 0) {
+            --i;
+            this.setAge(i);
+        }
+
+        if (this.love > 0) {
+            --this.love;
+            String s = "heart";
+
+            if (this.love % 10 == 0) {
+                double d0 = this.random.nextGaussian() * 0.02D;
+                double d1 = this.random.nextGaussian() * 0.02D;
+                double d2 = this.random.nextGaussian() * 0.02D;
+
+                this.world.a(s, this.locX + (double) (this.random.nextFloat() * this.length * 2.0F) - (double) this.length, this.locY + 0.5D + (double) (this.random.nextFloat() * this.width), this.locZ + (double) (this.random.nextFloat() * this.length * 2.0F) - (double) this.length, d0, d1, d2);
+            }
+        } else {
+            this.b = 0;
+        }
+    }
+
+    protected void a(Entity entity, float f) {
+        if (entity instanceof EntityHuman) {
+            if (f < 3.0F) {
+                double d0 = entity.locX - this.locX;
+                double d1 = entity.locZ - this.locZ;
+
+                this.yaw = (float) (Math.atan2(d1, d0) * 180.0D / 3.1415927410125732D) - 90.0F;
+                this.e = true;
+            }
+
+            EntityHuman entityhuman = (EntityHuman) entity;
+
+            if (entityhuman.P() == null || !this.a(entityhuman.P())) {
+                this.target = null;
+            }
+        } else if (entity instanceof EntityAnimal) {
+            EntityAnimal entityanimal = (EntityAnimal) entity;
+
+            if (this.getAge() > 0 && entityanimal.getAge() < 0) {
+                if ((double) f < 2.5D) {
+                    this.e = true;
+                }
+            } else if (this.love > 0 && entityanimal.love > 0) {
+                if (entityanimal.target == null) {
+                    entityanimal.target = this;
+                }
+
+                if (entityanimal.target == this && (double) f < 3.5D) {
+                    ++entityanimal.love;
+                    ++this.love;
+                    ++this.b;
+                    if (this.b % 4 == 0) {
+                        this.world.a("heart", this.locX + (double) (this.random.nextFloat() * this.length * 2.0F) - (double) this.length, this.locY + 0.5D + (double) (this.random.nextFloat() * this.width), this.locZ + (double) (this.random.nextFloat() * this.length * 2.0F) - (double) this.length, 0.0D, 0.0D, 0.0D);
+                    }
+
+                    if (this.b == 60) {
+                        this.b((EntityAnimal) entity);
+                    }
+                } else {
+                    this.b = 0;
+                }
+            } else {
+                this.b = 0;
+            }
+        }
+    }
+
+    private void b(EntityAnimal entityanimal) {
+        EntityAnimal entityanimal1 = this.createChild(entityanimal);
+
+        if (entityanimal1 != null) {
+            this.setAge(6000);
+            entityanimal.setAge(6000);
+            this.love = 0;
+            this.b = 0;
+            this.target = null;
+            entityanimal.target = null;
+            entityanimal.b = 0;
+            entityanimal.love = 0;
+            entityanimal1.setAge(-24000);
+            entityanimal1.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
+
+            for (int i = 0; i < 7; ++i) {
+                double d0 = this.random.nextGaussian() * 0.02D;
+                double d1 = this.random.nextGaussian() * 0.02D;
+                double d2 = this.random.nextGaussian() * 0.02D;
+
+                this.world.a("heart", this.locX + (double) (this.random.nextFloat() * this.length * 2.0F) - (double) this.length, this.locY + 0.5D + (double) (this.random.nextFloat() * this.width), this.locZ + (double) (this.random.nextFloat() * this.length * 2.0F) - (double) this.length, d0, d1, d2);
+            }
+
+            this.world.addEntity(entityanimal1);
+        }
+    }
+
+    protected abstract EntityAnimal createChild(EntityAnimal entityanimal);
+
+    protected void b(Entity entity, float f) {}
+
+    public boolean damageEntity(DamageSource damagesource, int i) {
+        this.f = 60;
+        this.target = null;
+        this.love = 0;
+        return super.damageEntity(damagesource, i);
+    }
+
+    protected float a(int i, int j, int k) {
+        return this.world.getTypeId(i, j - 1, k) == Block.GRASS.id ? 10.0F : this.world.m(i, j, k) - 0.5F;
+    }
+
+    public void b(NBTTagCompound nbttagcompound) {
+        super.b(nbttagcompound);
+        nbttagcompound.a("Age", this.getAge());
+        nbttagcompound.a("InLove", this.love);
+    }
+
+    public void a(NBTTagCompound nbttagcompound) {
+        super.a(nbttagcompound);
+        this.setAge(nbttagcompound.f("Age"));
+        this.love = nbttagcompound.f("InLove");
+    }
+
+    protected Entity findTarget() {
+        if (this.f > 0) {
+            return null;
+        } else {
+            float f = 8.0F;
+            List list;
+            int i;
+            EntityAnimal entityanimal;
+
+            if (this.love > 0) {
+                list = this.world.a(this.getClass(), this.boundingBox.a((double) f, (double) f, (double) f));
+
+                for (i = 0; i < list.size(); ++i) {
+                    entityanimal = (EntityAnimal) list.get(i);
+                    if (entityanimal != this && entityanimal.love > 0) {
+                        return entityanimal;
+                    }
+                }
+            } else if (this.getAge() == 0) {
+                list = this.world.a(EntityHuman.class, this.boundingBox.a((double) f, (double) f, (double) f));
+
+                for (i = 0; i < list.size(); ++i) {
+                    EntityHuman entityhuman = (EntityHuman) list.get(i);
+
+                    if (entityhuman.P() != null && this.a(entityhuman.P())) {
+                        return entityhuman;
+                    }
+                }
+            } else if (this.getAge() > 0) {
+                list = this.world.a(this.getClass(), this.boundingBox.a((double) f, (double) f, (double) f));
+
+                for (i = 0; i < list.size(); ++i) {
+                    entityanimal = (EntityAnimal) list.get(i);
+                    if (entityanimal != this && entityanimal.getAge() < 0) {
+                        return entityanimal;
+                    }
+                }
+            }
+
+            return null;
+        }
+    }
+
+    public boolean g() {
+        int i = MathHelper.floor(this.locX);
+        int j = MathHelper.floor(this.boundingBox.b);
+        int k = MathHelper.floor(this.locZ);
+
+        return this.world.getTypeId(i, j - 1, k) == Block.GRASS.id && this.world.k(i, j, k) > 8 && super.g();
+    }
+
+    public int h() {
+        return 120;
+    }
+
+    protected boolean d_() {
+        return false;
+    }
+
+    protected int a(EntityHuman entityhuman) {
+        return 1 + this.world.random.nextInt(3);
+    }
+
+    protected boolean a(ItemStack itemstack) {
+        return itemstack.id == Item.WHEAT.id;
+    }
+
+    public boolean b(EntityHuman entityhuman) {
+        ItemStack itemstack = entityhuman.inventory.getItemInHand();
+
+        if (itemstack != null && this.a(itemstack) && this.getAge() == 0) {
+            --itemstack.count;
+            if (itemstack.count <= 0) {
+                entityhuman.inventory.setItem(entityhuman.inventory.itemInHandIndex, (ItemStack) null);
+            }
+
+            this.love = 600;
+            this.target = null;
+
+            for (int i = 0; i < 7; ++i) {
+                double d0 = this.random.nextGaussian() * 0.02D;
+                double d1 = this.random.nextGaussian() * 0.02D;
+                double d2 = this.random.nextGaussian() * 0.02D;
+
+                this.world.a("heart", this.locX + (double) (this.random.nextFloat() * this.length * 2.0F) - (double) this.length, this.locY + 0.5D + (double) (this.random.nextFloat() * this.width), this.locZ + (double) (this.random.nextFloat() * this.length * 2.0F) - (double) this.length, d0, d1, d2);
+            }
+
+            return true;
+        } else {
+            return super.b(entityhuman);
+        }
+    }
+
+    public boolean l() {
+        return this.getAge() < 0;
+    }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 76bc4084..2cf8e8a0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -81,7 +81,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
             }
             // Slimes are a special (and broken) case
             else if (entity instanceof EntitySlime) {
-                if (entity instanceof MagmaCube) { return new CraftMagmaCube(server, (EntityLavaSlime) entity); }
+                if (entity instanceof EntityLavaSlime) { return new CraftMagmaCube(server, (EntityLavaSlime) entity); }
                 else { return new CraftSlime(server, (EntitySlime) entity); }
             }
             // Flying