Update CraftBukkit to Minecraft 1.7.5

1 files changed, 16 insertions, 16 deletions

diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
index 9f818cf0..c148c4da 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -100,15 +100,15 @@ public class EntityTrackerEntry {
             }
 
             this.b();
-        } else if (this.m % this.c == 0 || this.tracker.am || this.tracker.getDataWatcher().a()) {
+        } else if (this.m % this.c == 0 || this.tracker.al || this.tracker.getDataWatcher().a()) {
             int i;
             int j;
 
             if (this.tracker.vehicle == null) {
                 ++this.v;
-                i = this.tracker.at.a(this.tracker.locX);
+                i = this.tracker.as.a(this.tracker.locX);
                 j = MathHelper.floor(this.tracker.locY * 32.0D);
-                int k = this.tracker.at.a(this.tracker.locZ);
+                int k = this.tracker.as.a(this.tracker.locZ);
                 int l = MathHelper.d(this.tracker.yaw * 256.0F / 360.0F);
                 int i1 = MathHelper.d(this.tracker.pitch * 256.0F / 360.0F);
                 int j1 = i - this.xLoc;
@@ -196,9 +196,9 @@ public class EntityTrackerEntry {
                     this.xRot = j;
                 }
 
-                this.xLoc = this.tracker.at.a(this.tracker.locX);
+                this.xLoc = this.tracker.as.a(this.tracker.locX);
                 this.yLoc = MathHelper.floor(this.tracker.locY * 32.0D);
-                this.zLoc = this.tracker.at.a(this.tracker.locZ);
+                this.zLoc = this.tracker.as.a(this.tracker.locZ);
                 this.b();
                 this.x = true;
             }
@@ -209,7 +209,7 @@ public class EntityTrackerEntry {
                 this.i = i;
             }
 
-            this.tracker.am = false;
+            this.tracker.al = false;
         }
 
         ++this.m;
@@ -248,7 +248,7 @@ public class EntityTrackerEntry {
         }
 
         if (this.tracker instanceof EntityLiving) {
-            AttributeMapServer attributemapserver = (AttributeMapServer) ((EntityLiving) this.tracker).bc();
+            AttributeMapServer attributemapserver = (AttributeMapServer) ((EntityLiving) this.tracker).bb();
             Set set = attributemapserver.b();
 
             if (!set.isEmpty()) {
@@ -287,13 +287,13 @@ public class EntityTrackerEntry {
         while (iterator.hasNext()) {
             EntityPlayer entityplayer = (EntityPlayer) iterator.next();
 
-            entityplayer.removeQueue.add(Integer.valueOf(this.tracker.getId()));
+            entityplayer.d(this.tracker);
         }
     }
 
     public void a(EntityPlayer entityplayer) {
         if (this.trackedPlayers.contains(entityplayer)) {
-            entityplayer.removeQueue.add(Integer.valueOf(this.tracker.getId()));
+            entityplayer.d(this.tracker);
             this.trackedPlayers.remove(entityplayer);
         }
     }
@@ -304,8 +304,8 @@ public class EntityTrackerEntry {
             double d1 = entityplayer.locZ - (double) (this.zLoc / 32);
 
             if (d0 >= (double) (-this.b) && d0 <= (double) this.b && d1 >= (double) (-this.b) && d1 <= (double) this.b) {
-                if (!this.trackedPlayers.contains(entityplayer) && (this.d(entityplayer) || this.tracker.o)) {
-                    // CraftBukkit start
+                if (!this.trackedPlayers.contains(entityplayer) && (this.d(entityplayer) || this.tracker.n)) {
+                    // CraftBukkit start - respect vanish API
                     if (this.tracker instanceof EntityPlayer) {
                         Player player = ((EntityPlayer) this.tracker).getBukkitEntity();
                         if (!entityplayer.getBukkitEntity().canSee(player)) {
@@ -325,7 +325,7 @@ public class EntityTrackerEntry {
                     }
 
                     if (this.tracker instanceof EntityLiving) {
-                        AttributeMapServer attributemapserver = (AttributeMapServer) ((EntityLiving) this.tracker).bc();
+                        AttributeMapServer attributemapserver = (AttributeMapServer) ((EntityLiving) this.tracker).bb();
                         Collection collection = attributemapserver.c();
 
                         // CraftBukkit start - If sending own attributes send scaled health instead of current maximum health
@@ -378,7 +378,7 @@ public class EntityTrackerEntry {
                     }
 
                     // CraftBukkit start - Fix for nonsensical head yaw
-                    this.i = MathHelper.d(this.tracker.getHeadRotation() * 256.0F / 360.0F); // tracker.ao() should be getHeadRotation
+                    this.i = MathHelper.d(this.tracker.getHeadRotation() * 256.0F / 360.0F);
                     this.broadcast(new PacketPlayOutEntityHeadRotation(this.tracker, (byte) i));
                     // CraftBukkit end
 
@@ -395,13 +395,13 @@ public class EntityTrackerEntry {
                 }
             } else if (this.trackedPlayers.contains(entityplayer)) {
                 this.trackedPlayers.remove(entityplayer);
-                entityplayer.removeQueue.add(Integer.valueOf(this.tracker.getId()));
+                entityplayer.d(this.tracker);
             }
         }
     }
 
     private boolean d(EntityPlayer entityplayer) {
-        return entityplayer.r().getPlayerChunkMap().a(entityplayer, this.tracker.ai, this.tracker.ak);
+        return entityplayer.r().getPlayerChunkMap().a(entityplayer, this.tracker.ah, this.tracker.aj);
     }
 
     public void scanPlayers(List list) {
@@ -517,7 +517,7 @@ public class EntityTrackerEntry {
     public void clear(EntityPlayer entityplayer) {
         if (this.trackedPlayers.contains(entityplayer)) {
             this.trackedPlayers.remove(entityplayer);
-            entityplayer.removeQueue.add(Integer.valueOf(this.tracker.getId()));
+            entityplayer.d(this.tracker);
         }
     }
 }