From 98c98d0f7aee6a5bf26fd04053d018c4b62dd2b0 Mon Sep 17 00:00:00 2001
From: feildmaster <admin@feildmaster.com>
Date: Tue, 21 Aug 2012 20:21:01 -0500
Subject: Fix entities not having valid "isValid" states. Addresses BUKKIT-2366

---
 src/main/java/net/minecraft/server/Entity.java | 2 +-
 src/main/java/net/minecraft/server/World.java  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 9db77a9c..f786464a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -91,7 +91,7 @@ public abstract class Entity {
     public boolean al;
     public EnumEntitySize am;
     public UUID uniqueId = UUID.randomUUID(); // CraftBukkit
-    public boolean valid = true; // CraftBukkit
+    public boolean valid = false; // 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 b3bdccc3..e3f8ed0a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -878,6 +878,8 @@ public abstract class World implements IBlockAccess {
 
             iworldaccess.a(entity);
         }
+
+        entity.valid = true; // CraftBukkit
     }
 
     protected void b(Entity entity) {
-- 
cgit v1.2.3