2 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 4c5758b8..144dc63c 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -143,6 +143,7 @@ public abstract class Entity {
     public boolean cd;
     public boolean ce;
     public UUID uniqueId = UUID.randomUUID(); // CraftBukkit
+    public boolean valid = true; // CraftBukkit
 
     public Entity(World world) {
         this.id = entityCount++;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index dc8a5f71..589c9320 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -929,6 +929,8 @@ public class World implements IBlockAccess {
         for (int i = 0; i < this.u.size(); ++i) {
             ((IWorldAccess) this.u.get(i)).b(entity);
         }
+
+        entity.valid = false; // CraftBukkit
     }
 
     public void kill(Entity entity) {