Long method geoff paul paul craft bukkit/src/main/java/org/bukkit/craftbukkit/entity/craft entity.java

src/main/java/net/minecraft/server/Entity.java

@@ -19,6 +19,7 @@
 import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
 import org.bukkit.event.vehicle.VehicleEnterEvent;
 import org.bukkit.event.vehicle.VehicleExitEvent;
+import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.craftbukkit.entity.CraftEntity;
 import org.bukkit.craftbukkit.entity.CraftPlayer;
@@ -115,6 +116,32 @@ static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
     public int getId() {
         return this.id;
     }
+
+    public CraftEntity getEntity(CraftServer server) {
+        return this.getEntity(server);
+    }
+
+    public static boolean isEntityAnimal(Entity entity) {
+        if (entity instanceof EntityChicken) {
+            return true;
+        } else if (entity instanceof EntityCow) {
+            return true;
+        } else if (entity instanceof EntityMushroomCow) {
+            return true;
+        } else if (entity instanceof EntityPig) {
+            return true;
+        } else if (entity instanceof EntityWolf) {
+            return true;
+        } else if (entity instanceof EntityOcelot) {
+            return true;
+        } else if (entity instanceof EntitySheep) {
+            return true;
+        } else if (entity instanceof EntityHorse) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 
     public void d(int i) {
         this.id = i;

src/main/java/net/minecraft/server/EntityBlaze.java

@@ -1,5 +1,9 @@
 package net.minecraft.server;
 
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.entity.CraftBlaze;
+import org.bukkit.craftbukkit.entity.CraftEntity;
+
 public class EntityBlaze extends EntityMonster {
 
     private float bp = 0.5F;
@@ -12,6 +16,10 @@ public EntityBlaze(World world) {
         this.b = 10;
     }
 
+    public CraftEntity getEntity(CraftServer server) {
+        return new CraftBlaze(server, (EntityBlaze) this);
+    }
+
     protected void aC() {
         super.aC();
         this.getAttributeInstance(GenericAttributes.e).setValue(6.0D);

src/main/java/net/minecraft/server/EntityChicken.java

@@ -1,5 +1,8 @@
 package net.minecraft.server;
 
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.entity.CraftChicken;
+import org.bukkit.craftbukkit.entity.CraftEntity;
 import org.bukkit.craftbukkit.util.CraftMagicNumbers; // CraftBukkit
 
 public class EntityChicken extends EntityAnimal {
@@ -25,6 +28,10 @@ public EntityChicken(World world) {
         this.goalSelector.a(6, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F));
         this.goalSelector.a(7, new PathfinderGoalRandomLookaround(this));
     }
+
+    public CraftEntity getEntity(CraftServer server) {
+        return new CraftChicken(server, (EntityChicken) this);
+    }
 
     public boolean bj() {
         return true;

src/main/java/net/minecraft/server/EntityCow.java

@@ -1,6 +1,10 @@
 package net.minecraft.server;
 
 // CraftBukkit start
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.entity.CraftChicken;
+import org.bukkit.craftbukkit.entity.CraftCow;
+import org.bukkit.craftbukkit.entity.CraftEntity;
 import org.bukkit.craftbukkit.event.CraftEventFactory;
 import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.craftbukkit.util.CraftMagicNumbers;
@@ -21,6 +25,10 @@ public EntityCow(World world) {
         this.goalSelector.a(6, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F));
         this.goalSelector.a(7, new PathfinderGoalRandomLookaround(this));
     }
+
+    public CraftEntity getEntity(CraftServer server) {
+        return new CraftCow(server, (EntityCow) this);
+    }
 
     public boolean bj() {
         return true;

src/main/java/net/minecraft/server/EntityCreeper.java

@@ -1,6 +1,9 @@
 package net.minecraft.server;
 
 // CraftBukkit start
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.entity.CraftCreeper;
+import org.bukkit.craftbukkit.entity.CraftEntity;
 import org.bukkit.craftbukkit.event.CraftEventFactory;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
 // CraftBukkit end
@@ -26,6 +29,10 @@ public EntityCreeper(World world) {
         this.targetSelector.a(2, new PathfinderGoalHurtByTarget(this, false));
     }
 
+    public CraftEntity getEntity(CraftServer server) {
+        return new CraftCreeper(server, (EntityCreeper) this);
+    }
+
     protected void aC() {
         super.aC();
         this.getAttributeInstance(GenericAttributes.d).setValue(0.25D);

src/main/java/net/minecraft/server/EntityEnderman.java

@@ -4,6 +4,9 @@
 
 // CraftBukkit start
 import org.bukkit.Location;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.entity.CraftEnderman;
+import org.bukkit.craftbukkit.entity.CraftEntity;
 import org.bukkit.craftbukkit.event.CraftEventFactory;
 import org.bukkit.event.entity.EntityTeleportEvent;
 // CraftBukkit end
@@ -23,6 +26,10 @@ public EntityEnderman(World world) {
         this.a(0.6F, 2.9F);
         this.W = 1.0F;
     }
+
+    public CraftEntity getEntity(CraftServer server) {
+        return new CraftEnderman(server, (EntityEnderman) this);
+    }
 
     protected void aC() {
         super.aC();

src/main/java/net/minecraft/server/EntityHorse.java

@@ -3,6 +3,9 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.entity.CraftEntity;
+import org.bukkit.craftbukkit.entity.CraftHorse;
 // CraftBukkit start
 import org.bukkit.craftbukkit.event.CraftEventFactory;
 import org.bukkit.event.entity.EntityDamageEvent;
@@ -57,6 +60,10 @@ public EntityHorse(World world) {
         this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
         this.loadChest();
     }
+
+    public CraftEntity getEntity(CraftServer server) {
+        return new CraftHorse(server, (EntityHorse) this);
+    }
 
     protected void c() {
         super.c();

src/main/java/net/minecraft/server/EntityMonster.java

@@ -3,6 +3,32 @@
 import org.bukkit.event.entity.EntityTargetEvent; // CraftBukkit
 
 public abstract class EntityMonster extends EntityCreature implements IMonster {
+
+    public static boolean isMonster(Entity entity) {
+        if (entity instanceof EntityZombie) {
+            return true;
+        } else if (entity instanceof EntityPigZombie) {
+            return true;
+        } else if (entity instanceof EntityCreeper) {
+            return true;
+        } else if (entity instanceof EntityEnderman) {
+            return true;
+        } else if (entity instanceof EntitySilverfish) {
+            return true;
+        } else if (entity instanceof EntitySkeleton) {
+            return true;
+        } else if (entity instanceof EntityBlaze) {
+            return true;
+        } else if (entity instanceof EntityWitch) {
+            return true;
+        }else if (entity instanceof EntityWither) {
+            return true;
+        } else if (entity instanceof EntitySpider) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 
     public EntityMonster(World world) {
         super(world);

src/main/java/net/minecraft/server/EntityMushroomCow.java

@@ -1,5 +1,8 @@
 package net.minecraft.server;
 
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.entity.CraftEntity;
+import org.bukkit.craftbukkit.entity.CraftMushroomCow;
 import org.bukkit.event.player.PlayerShearEntityEvent; // CraftBukkit
 
 public class EntityMushroomCow extends EntityCow {
@@ -57,6 +60,10 @@ public boolean a(EntityHuman entityhuman) {
             return super.a(entityhuman);
         }
     }
+
+    public CraftEntity getEntity(CraftServer server) {
+        return new CraftMushroomCow(server, (EntityMushroomCow) this);
+    }
 
     public EntityMushroomCow c(EntityAgeable entityageable) {
         return new EntityMushroomCow(this.world);

src/main/java/net/minecraft/server/EntityOcelot.java

@@ -1,5 +1,9 @@
 package net.minecraft.server;
 
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.entity.CraftEntity;
+import org.bukkit.craftbukkit.entity.CraftOcelot;
+
 public class EntityOcelot extends EntityTameableAnimal {
 
     private PathfinderGoalTempt bq;
@@ -21,6 +25,10 @@ public EntityOcelot(World world) {
         this.goalSelector.a(11, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 10.0F));
         this.targetSelector.a(1, new PathfinderGoalRandomTargetNonTamed(this, EntityChicken.class, 750, false));
     }
+
+    public CraftEntity getEntity(CraftServer server) {
+        return new CraftOcelot(server, (EntityOcelot) this);
+    }
 
     protected void c() {
         super.c();

src/main/java/net/minecraft/server/EntityPig.java

@@ -1,6 +1,9 @@
 package net.minecraft.server;
 
 // CraftBukkit start
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.entity.CraftEntity;
+import org.bukkit.craftbukkit.entity.CraftPig;
 import org.bukkit.craftbukkit.event.CraftEventFactory;
 import org.bukkit.craftbukkit.util.CraftMagicNumbers;
 // CraftBukkit end
@@ -24,6 +27,10 @@ public EntityPig(World world) {
         this.goalSelector.a(7, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F));
         this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
     }
+
+    public CraftEntity getEntity(CraftServer server) {
+        return new CraftPig(server, (EntityPig) this);
+    }
 
     public boolean bj() {
         return true;

src/main/java/net/minecraft/server/EntityPigZombie.java

@@ -3,6 +3,9 @@
 import java.util.List;
 import java.util.UUID;
 
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.entity.CraftEntity;
+import org.bukkit.craftbukkit.entity.CraftPigZombie;
 // CraftBukkit start
 import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.event.entity.EntityTargetEvent;
@@ -20,6 +23,10 @@ public EntityPigZombie(World world) {
         super(world);
         this.fireProof = true;
     }
+
+    public CraftEntity getEntity(CraftServer server) {
+        return new CraftPigZombie(server, (EntityPigZombie) this);
+    }
 
     protected void aC() {
         super.aC();

src/main/java/net/minecraft/server/EntitySheep.java

@@ -2,6 +2,9 @@
 
 import java.util.Random;
 
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.entity.CraftEntity;
+import org.bukkit.craftbukkit.entity.CraftSheep;
 // CraftBukkit start
 import org.bukkit.event.entity.SheepRegrowWoolEvent;
 import org.bukkit.event.player.PlayerShearEntityEvent;
@@ -31,6 +34,10 @@ public EntitySheep(World world) {
         this.bq.setItem(1, new ItemStack(Items.INK_SACK, 1, 0));
         this.bq.resultInventory = new InventoryCraftResult(); // CraftBukkit - add result slot for event
     }
+
+    public CraftEntity getEntity(CraftServer server) {
+        return new CraftSheep(server, (EntitySheep) this);
+    }
 
     protected boolean bj() {
         return true;

src/main/java/net/minecraft/server/EntitySilverfish.java

@@ -2,6 +2,9 @@
 
 import net.minecraft.util.org.apache.commons.lang3.tuple.ImmutablePair;
 
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.entity.CraftEntity;
+import org.bukkit.craftbukkit.entity.CraftSilverfish;
 import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
 
 public class EntitySilverfish extends EntityMonster {
@@ -19,6 +22,10 @@ protected void aC() {
         this.getAttributeInstance(GenericAttributes.d).setValue(0.6000000238418579D);
         this.getAttributeInstance(GenericAttributes.e).setValue(1.0D);
     }
+
+    public CraftEntity getEntity(CraftServer server) {
+        return new CraftSilverfish(server, (EntitySilverfish) this);
+    }
 
     protected boolean g_() {
         return false;

src/main/java/net/minecraft/server/EntitySkeleton.java

@@ -2,6 +2,9 @@
 
 import java.util.Calendar;
 
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.entity.CraftEntity;
+import org.bukkit.craftbukkit.entity.CraftSkeleton;
 import org.bukkit.event.entity.EntityCombustEvent; // CraftBukkit
 
 public class EntitySkeleton extends EntityMonster implements IRangedEntity {
@@ -23,6 +26,10 @@ public EntitySkeleton(World world) {
             this.bZ();
         }
     }
+
+    public CraftEntity getEntity(CraftServer server) {
+        return new CraftSkeleton(server, (EntitySkeleton) this);
+    }
 
     protected void aC() {
         super.aC();

src/main/java/net/minecraft/server/EntitySpider.java

@@ -1,6 +1,9 @@
 package net.minecraft.server;
 
 // CraftBukkit start
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.entity.CraftEntity;
+import org.bukkit.craftbukkit.entity.CraftSpider;
 import org.bukkit.craftbukkit.util.CraftMagicNumbers;
 import org.bukkit.event.entity.EntityTargetEvent;
 // CraftBukkti end
@@ -12,6 +15,10 @@ public EntitySpider(World world) {
         this.a(1.4F, 0.9F);
     }
 
+    public CraftEntity getEntity(CraftServer server) {
+        return new CraftSpider(server, (EntitySpider) this);
+    }
+
     protected void c() {
         super.c();
         this.datawatcher.a(16, new Byte((byte) 0));

src/main/java/net/minecraft/server/EntityWitch.java

@@ -4,6 +4,10 @@
 import java.util.List;
 import java.util.UUID;
 
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.entity.CraftEntity;
+import org.bukkit.craftbukkit.entity.CraftWitch;
+
 public class EntityWitch extends EntityMonster implements IRangedEntity {
 
     private static final UUID bp = UUID.fromString("5CD17E52-A79A-43D3-A529-90FDE04B181E");
@@ -22,6 +26,10 @@ public EntityWitch(World world) {
         this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget(this, EntityHuman.class, 0, true));
     }
 
+    public CraftEntity getEntity(CraftServer server) {
+        return new CraftWitch(server, (EntityWitch) this);
+    }
+
     protected void c() {
         super.c();
         this.getDataWatcher().a(21, Byte.valueOf((byte) 0));