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.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
index aaa7eaa8..f6595e3e 100644
--- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java
+++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
@@ -289,7 +289,7 @@ public class ServerConfigurationManager {
         worldserver.addEntity(entityplayer1);
         this.players.add(entityplayer1);
         this.updateClient(entityplayer1); // CraftBukkit
-        entityplayer1.A();
+        entityplayer1.B();
         // CraftBukkit start - don't fire on respawn
         if (fromWorld != location.getWorld()) {
             org.bukkit.event.player.PlayerChangedWorldEvent event = new org.bukkit.event.player.PlayerChangedWorldEvent((Player) entityplayer1.getBukkitEntity(), fromWorld);
@@ -321,7 +321,7 @@ public class ServerConfigurationManager {
 
                 toLocation = toWorld == null ? null : new Location(toWorld.getWorld(), (entityplayer.locX * blockRatio), entityplayer.locY, (entityplayer.locZ * blockRatio), entityplayer.yaw, entityplayer.pitch);
             } else {
-                ChunkCoordinates coords = toWorld.d();
+                ChunkCoordinates coords = toWorld.getDimensionSpawn();
                 if (coords != null) {
                     toLocation = new Location(toWorld.getWorld(), coords.x, coords.y, coords.z, 90, 0);
                 }
@@ -358,7 +358,7 @@ public class ServerConfigurationManager {
         if (this.p < this.players.size()) {
             EntityPlayer entityplayer = (EntityPlayer) this.players.get(this.p);
 
-            this.sendAll(new Packet201PlayerInfo(entityplayer.name, true, entityplayer.i));
+            this.sendAll(new Packet201PlayerInfo(entityplayer.name, true, entityplayer.ping));
         }
         */