From 1f2c44e657953139b24bc3a1db46bf844b7c9109 Mon Sep 17 00:00:00 2001
From: EvilSeph <evilseph@unaligned.org>
Date: Wed, 4 May 2011 21:25:57 -0400
Subject: [PATCH] Fixed 'Entity is already tracked' issues.

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

diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
index 05b4b2a306..4a7541dccd 100644
--- a/src/main/java/net/minecraft/server/EntityTracker.java
+++ b/src/main/java/net/minecraft/server/EntityTracker.java
@@ -69,7 +69,8 @@ public class EntityTracker {
         }
 
         if (this.b.b(entity.id)) {
-            throw new IllegalStateException("Entity is already tracked!");
+            // CraftBukkit - removed exception throw as tracking an already tracked entity theoretically shouldn't cause any issues.
+            //throw new IllegalStateException("Entity is already tracked!");
         } else {
             EntityTrackerEntry entitytrackerentry = new EntityTrackerEntry(entity, i, j, flag);