diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityTrackerEntry.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityTrackerEntry.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java index ae9ed523..4871bd73 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -73,13 +73,13 @@ public class EntityTrackerEntry { this.broadcast(new Packet39AttachEntity(this.tracker, this.tracker.vehicle)); } - if (this.tracker instanceof EntityItemFrame && this.m % 10 == 0) { + if (this.tracker instanceof EntityItemFrame /*&& this.m % 10 == 0*/) { // CraftBukkit - Moved below, should always enter this block EntityItemFrame i4 = (EntityItemFrame) this.tracker; ItemStack i5 = i4.i(); - if (i5 != null && i5.getItem() instanceof ItemWorldMap) { + if (this.m % 10 == 0 && i5 != null && i5.getItem() instanceof ItemWorldMap) { // CraftBukkit - Moved this.m % 10 logic here so item frames do not enter the other blocks WorldMap i7 = Item.MAP.getSavedMap(i5, this.tracker.world); - Iterator j0 = list.iterator(); + Iterator j0 = this.trackedPlayers.iterator(); // CraftBukkit while (j0.hasNext()) { EntityHuman j1 = (EntityHuman) j0.next(); @@ -119,7 +119,7 @@ public class EntityTrackerEntry { boolean flag = Math.abs(j1) >= 4 || Math.abs(k1) >= 4 || Math.abs(l1) >= 4 || this.m % 60 == 0; boolean flag1 = Math.abs(l - this.yRot) >= 4 || Math.abs(i1 - this.xRot) >= 4; - // CraftBukkit start - code moved from below + // CraftBukkit start - Code moved from below if (flag) { this.xLoc = i; this.yLoc = j; @@ -143,7 +143,7 @@ public class EntityTrackerEntry { } } else { this.u = 0; - // CraftBukkit start - refresh list of who can see a player before sending teleport packet + // CraftBukkit start - Refresh list of who can see a player before sending teleport packet if (this.tracker instanceof EntityPlayer) { this.scanPlayers(new java.util.ArrayList(this.trackedPlayers)); } @@ -177,7 +177,7 @@ public class EntityTrackerEntry { this.broadcastIncludingSelf(new Packet40EntityMetadata(this.tracker.id, datawatcher1, false)); } - /* CraftBukkit start - code moved up + /* CraftBukkit start - Code moved up if (flag) { this.xLoc = i; this.yLoc = j; @@ -225,7 +225,7 @@ public class EntityTrackerEntry { ++this.m; if (this.tracker.velocityChanged) { - // CraftBukkit start - create PlayerVelocity event + // CraftBukkit start - Create PlayerVelocity event boolean cancelled = false; if (this.tracker instanceof EntityPlayer) { @@ -375,7 +375,7 @@ public class EntityTrackerEntry { private Packet b() { if (this.tracker.dead) { - // CraftBukkit start - remove useless error spam, just return + // CraftBukkit start - Remove useless error spam, just return // this.tracker.world.getLogger().warning("Fetching addPacket for removed entity"); return null; // CraftBukkit end |