1 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
index 9f2c621d..05b4b2a3 100644
--- a/src/main/java/net/minecraft/server/EntityTracker.java
+++ b/src/main/java/net/minecraft/server/EntityTracker.java
@@ -14,7 +14,7 @@ public class EntityTracker {
 
     public EntityTracker(MinecraftServer minecraftserver) {
         this.c = minecraftserver;
-        this.d = minecraftserver.f.a();
+        this.d = minecraftserver.serverConfigurationManager.a();
     }
 
     // CraftBukkit -- synchronized
@@ -27,7 +27,7 @@ public class EntityTracker {
             while (iterator.hasNext()) {
                 EntityTrackerEntry entitytrackerentry = (EntityTrackerEntry) iterator.next();
 
-                if (entitytrackerentry.a != entityplayer) {
+                if (entitytrackerentry.tracker != entityplayer) {
                     entitytrackerentry.b(entityplayer);
                 }
             }
@@ -76,12 +76,12 @@ public class EntityTracker {
             this.a.add(entitytrackerentry);
             this.b.a(entity.id, entitytrackerentry);
             // CraftBukkit
-            entitytrackerentry.b(entity.world.d); // CraftBukkit
+            entitytrackerentry.scanPlayers(entity.world.players);
         }
     }
 
     // CraftBukkit -- synchronized
-    public synchronized void b(Entity entity) {
+    public synchronized void untrackEntity(Entity entity) {
         if (entity instanceof EntityPlayer) {
             EntityPlayer entityplayer = (EntityPlayer) entity;
             Iterator iterator = this.a.iterator();
@@ -110,9 +110,9 @@ public class EntityTracker {
             EntityTrackerEntry entitytrackerentry = (EntityTrackerEntry) iterator.next();
 
             // CraftBukkit
-            entitytrackerentry.a(entitytrackerentry.a.world.d);
-            if (entitytrackerentry.m && entitytrackerentry.a instanceof EntityPlayer) {
-                arraylist.add((EntityPlayer) entitytrackerentry.a);
+            entitytrackerentry.track(entitytrackerentry.tracker.world.players);
+            if (entitytrackerentry.m && entitytrackerentry.tracker instanceof EntityPlayer) {
+                arraylist.add((EntityPlayer) entitytrackerentry.tracker);
             }
         }
 
@@ -123,7 +123,7 @@ public class EntityTracker {
             while (iterator1.hasNext()) {
                 EntityTrackerEntry entitytrackerentry1 = (EntityTrackerEntry) iterator1.next();
 
-                if (entitytrackerentry1.a != entityplayer) {
+                if (entitytrackerentry1.tracker != entityplayer) {
                     entitytrackerentry1.b(entityplayer);
                 }
             }
@@ -149,7 +149,7 @@ public class EntityTracker {
     }
 
     // CraftBukkit -- synchronized
-    public synchronized void a(EntityPlayer entityplayer) {
+    public synchronized void trackPlayer(EntityPlayer entityplayer) {
         Iterator iterator = this.a.iterator();
 
         while (iterator.hasNext()) {