diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index b95ef2b954..8fd6672a48 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2,8 +2,6 @@ package net.minecraft.server;
 
 // CraftBukkit start
 import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.craftbukkit.CraftWorld;
-import org.bukkit.craftbukkit.entity.CraftEntity;
 import org.bukkit.event.Event.Type;
 import org.bukkit.event.entity.EntityCombustEvent;
 import org.bukkit.event.entity.EntityDamageByBlockEvent;
@@ -119,7 +117,7 @@ public abstract class Entity {
         af.a(0, ((Byte.valueOf((byte) 0))));
         a();
         
-        bukkitEntity = new CraftEntity(((WorldServer) l).getServer(), this); // CraftBukkit
+        bukkitEntity = null; // CraftBukkit
     }
 
     protected abstract void a();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index c37a150c63..560ad6cca1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -7,7 +7,7 @@ import org.bukkit.World;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.util.Vector;
 
-public class CraftEntity implements org.bukkit.entity.Entity {
+public abstract class CraftEntity implements org.bukkit.entity.Entity {
     protected final CraftServer server;
     private Entity entity;