fixed imports on all Entities

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

@@ -1,13 +1,13 @@
 package net.minecraft.server;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.entity.EntityCombustEvent;
 import org.bukkit.event.entity.EntityDamageByBlockEvent;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-// CraftBukkit end
+//CraftBukkit end
 
 import java.util.List;
 import java.util.Random;

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

@@ -1,7 +1,9 @@
 package net.minecraft.server;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.entity.CraftAnimals;
+//CraftBukkit end
 
 public abstract class EntityAnimals extends EntityCreature implements IAnimals {
 

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

@@ -2,9 +2,10 @@ package net.minecraft.server;
 
 import java.util.Random;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.craftbukkit.entity.CraftAnimals;
 import org.bukkit.craftbukkit.entity.CraftChicken;
+//CraftBukkit end
 
 public class EntityChicken extends EntityAnimals {
 

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

@@ -1,7 +1,9 @@
 package net.minecraft.server;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.entity.CraftCow;
+//CraftBukkit end
 
 public class EntityCow extends EntityAnimals {
 

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

@@ -2,8 +2,10 @@ package net.minecraft.server;
 
 import java.util.Random;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.entity.CraftCreature;
+//CraftBukkit end
 
 public class EntityCreature extends EntityLiving {
 

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

@@ -2,8 +2,10 @@ package net.minecraft.server;
 
 import java.util.Random;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.entity.CraftCreeper;
+//CraftBukkit end
 
 public class EntityCreeper extends EntityMobs {
 

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

@@ -6,11 +6,7 @@ import java.util.Random;
 // CraftBukkit start
 import org.bukkit.entity.MobType;
 import org.bukkit.entity.Player;
-import org.bukkit.craftbukkit.entity.CraftArrow;
 import org.bukkit.craftbukkit.entity.CraftEgg;
-import org.bukkit.craftbukkit.entity.CraftEntity;
-import org.bukkit.craftbukkit.entity.CraftLivingEntity;
-import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.entity.EntityDamageByProjectileEvent;

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

@@ -1,7 +1,9 @@
 package net.minecraft.server;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.entity.CraftFallingSand;
+//CraftBukkit end
 
 public class EntityFallingSand extends Entity {
 

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

@@ -3,6 +3,7 @@ package net.minecraft.server;
 import java.util.List;
 import java.util.Random;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.entity.CraftFireball;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.event.entity.EntityDamageByProjectileEvent;

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

@@ -4,11 +4,7 @@ import java.util.List;
 import java.util.Random;
 
 // CraftBukkit start
-import org.bukkit.craftbukkit.entity.CraftEgg;
-import org.bukkit.craftbukkit.entity.CraftEntity;
-import org.bukkit.craftbukkit.entity.CraftFireball;
 import org.bukkit.craftbukkit.entity.CraftFish;
-import org.bukkit.craftbukkit.entity.CraftLivingEntity;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.event.entity.EntityDamageByProjectileEvent;
 import org.bukkit.event.entity.EntityDamageEvent;

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

@@ -1,7 +1,9 @@
 package net.minecraft.server;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.entity.CraftFlying;
+//CraftBukkit end
 
 public class EntityFlying extends EntityLiving {
 

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

@@ -3,8 +3,10 @@ package net.minecraft.server;
 import java.util.List;
 import java.util.Random;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.entity.CraftGhast;
+//CraftBukkit end
 
 public class EntityGhast extends EntityFlying implements IMobs {
 

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

@@ -2,8 +2,10 @@ package net.minecraft.server;
 
 import java.util.Random;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.entity.CraftItem;
+//CraftBukkit end
 
 public class EntityItem extends Entity {
 

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

@@ -3,8 +3,10 @@ package net.minecraft.server;
 import java.util.List;
 import java.util.Random;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.entity.CraftLivingEntity;
+//CraftBukkit end
 
 public abstract class EntityLiving extends Entity {
 

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

@@ -3,13 +3,9 @@ package net.minecraft.server;
 import java.util.Random;
 
 //CraftBukkit start
-import org.bukkit.craftbukkit.entity.CraftEntity;
-import org.bukkit.craftbukkit.entity.CraftLivingEntity;
-import org.bukkit.craftbukkit.entity.CraftMinecart;
 import org.bukkit.craftbukkit.entity.CraftMonster;
 import org.bukkit.craftbukkit.CraftServer;
 
-import org.bukkit.event.entity.EntityDamageByBlockEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;

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

@@ -2,8 +2,10 @@ package net.minecraft.server;
 
 import java.util.*;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.entity.CraftPainting;
+//CraftBukkit end
 
 public class EntityPainting extends Entity {
 

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

@@ -1,7 +1,9 @@
 package net.minecraft.server;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.entity.CraftPig;
+//CraftBukkit end
 
 public class EntityPig extends EntityAnimals {
 

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

@@ -3,8 +3,10 @@ package net.minecraft.server;
 import java.util.List;
 import java.util.Random;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.entity.CraftPigZombie;
+//CraftBukkit end
 
 public class EntityPigZombie extends EntityZombie {
 

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

@@ -3,12 +3,13 @@ package net.minecraft.server;
 import java.util.List;
 import java.util.Random;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
-// CraftBukkit end
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+//CraftBukkit end
 
 public abstract class EntityPlayer extends EntityLiving {
 

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

@@ -2,8 +2,10 @@ package net.minecraft.server;
 
 import java.util.Random;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.entity.CraftSheep;
+//CraftBukkit end
 
 public class EntitySheep extends EntityAnimals {
 

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

@@ -2,6 +2,7 @@ package net.minecraft.server;
 
 import java.util.Random;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.entity.CraftSkeleton;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.event.Event.Type;

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

@@ -2,9 +2,10 @@ package net.minecraft.server;
 
 import java.util.Random;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.craftbukkit.entity.CraftSkeleton;
 import org.bukkit.craftbukkit.entity.CraftSlime;
+//CraftBukkit stop
 
 public class EntitySlime extends EntityLiving implements IMobs {
 

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

@@ -4,8 +4,6 @@ import java.util.List;
 import java.util.Random;
 
 //CraftBukkit start
-import org.bukkit.craftbukkit.entity.CraftEntity;
-import org.bukkit.craftbukkit.entity.CraftLivingEntity;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.entity.CraftSnowball;
 import org.bukkit.event.entity.EntityDamageByProjectileEvent;

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

@@ -2,8 +2,10 @@ package net.minecraft.server;
 
 import java.util.Random;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.entity.CraftSpider;
+//CraftBukkit stop
 
 public class EntitySpider extends EntityMobs {
 

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

@@ -2,8 +2,10 @@ package net.minecraft.server;
 
 import java.util.Random;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.entity.CraftSquid;
+//CraftBukkit stop
 
 public class EntitySquid extends EntityWaterMob {
 

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

@@ -1,8 +1,9 @@
 package net.minecraft.server;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.craftbukkit.entity.CraftSkeleton;
 import org.bukkit.craftbukkit.entity.CraftTNTPrimed;
+//CraftBukkit stop
 
 public class EntityTNTPrimed extends Entity {
 

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

@@ -1,7 +1,9 @@
 package net.minecraft.server;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.entity.CraftWaterMob;
+//CraftBukkit stop
 
 public class EntityWaterMob extends EntityCreature implements IAnimals {
 

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

@@ -1,5 +1,6 @@
 package net.minecraft.server;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.entity.CraftZombie;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.event.Event.Type;

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

@@ -1,7 +1,9 @@
 package net.minecraft.server;
 
+//CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.entity.CraftGiant;
+//CraftBukkit stop
 
 public class EntityZombieSimple extends EntityMobs {