Update for 1.1_01 renames.

We know these updates (can) break plugins bypassing Bukkit. They are needed for
smooth updates however. There will be another one right before before 1.1-R1.
This commit is contained in:
Erik Broes
2012-01-14 21:03:48 +01:00
parent 6495eee0c9
commit 61ec751ca1
85 changed files with 466 additions and 456 deletions

View File

@@ -11,11 +11,11 @@ public class EntityTracker {
private IntHashMap trackedEntities = new IntHashMap();
private MinecraftServer c;
private int d;
private World e; // CraftBukkit - change type
private World world; // CraftBukkit - change type
public EntityTracker(MinecraftServer minecraftserver, World i) { // CraftBukkit - change method signature
this.c = minecraftserver;
this.e = i;
this.world = i;
this.d = minecraftserver.serverConfigurationManager.a();
}
@@ -94,7 +94,7 @@ public class EntityTracker {
this.a.add(entitytrackerentry);
this.trackedEntities.a(entity.id, entitytrackerentry);
entitytrackerentry.scanPlayers(this.e.players); // CraftBukkit
entitytrackerentry.scanPlayers(this.world.players); // CraftBukkit
}
}
@@ -127,7 +127,7 @@ public class EntityTracker {
while (iterator.hasNext()) {
EntityTrackerEntry entitytrackerentry = (EntityTrackerEntry) iterator.next();
entitytrackerentry.track(this.e.players); // CraftBukkit
entitytrackerentry.track(this.world.players); // CraftBukkit
if (entitytrackerentry.m && entitytrackerentry.tracker instanceof EntityPlayer) {
arraylist.add((EntityPlayer) entitytrackerentry.tracker);
}
@@ -152,7 +152,7 @@ public class EntityTracker {
EntityTrackerEntry entitytrackerentry = (EntityTrackerEntry) this.trackedEntities.a(entity.id);
if (entitytrackerentry != null) {
entitytrackerentry.a(packet);
entitytrackerentry.broadcast(packet);
}
}
@@ -161,7 +161,7 @@ public class EntityTracker {
EntityTrackerEntry entitytrackerentry = (EntityTrackerEntry) this.trackedEntities.a(entity.id);
if (entitytrackerentry != null) {
entitytrackerentry.b(packet);
entitytrackerentry.broadcastIncludingSelf(packet);
}
}