diff options
author | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-01-12 15:27:39 +0000 |
---|---|---|
committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-01-12 15:27:39 +0000 |
commit | 897551e39e0e24812acc0704e963d347dfa4a8ef (patch) | |
tree | 1a85a0768d56b78fc438f182ebfecabc584d6548 /src/main/java/net/minecraft/server/ServerConfigurationManager.java | |
parent | 7f079a0cd6c87cf6360a0ed86592f88d374ba268 (diff) | |
download | craftbukkit-897551e39e0e24812acc0704e963d347dfa4a8ef.tar craftbukkit-897551e39e0e24812acc0704e963d347dfa4a8ef.tar.gz craftbukkit-897551e39e0e24812acc0704e963d347dfa4a8ef.tar.lz craftbukkit-897551e39e0e24812acc0704e963d347dfa4a8ef.tar.xz craftbukkit-897551e39e0e24812acc0704e963d347dfa4a8ef.zip |
Update to mc-dev rename revision 01
Diffstat (limited to 'src/main/java/net/minecraft/server/ServerConfigurationManager.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ServerConfigurationManager.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java index ef1dff1e..0213adc8 100644 --- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java +++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java @@ -107,7 +107,7 @@ public class ServerConfigurationManager { } public void b(EntityPlayer entityplayer) { - this.playerFileData.b(entityplayer); + this.playerFileData.load(entityplayer); } public void c(EntityPlayer entityplayer) { @@ -120,7 +120,7 @@ public class ServerConfigurationManager { worldserver.chunkProviderServer.getChunkAt((int) entityplayer.locX >> 4, (int) entityplayer.locZ >> 4); - while (worldserver.getEntities(entityplayer, entityplayer.boundingBox).size() != 0) { + while (worldserver.a(entityplayer, entityplayer.boundingBox).size() != 0) { entityplayer.setPosition(entityplayer.locX, entityplayer.locY + 1.0D, entityplayer.locZ); } @@ -142,7 +142,7 @@ public class ServerConfigurationManager { EntityPlayer entityplayer1 = (EntityPlayer) this.players.get(i); // CraftBukkit start - .name -> .listName - entityplayer.netServerHandler.sendPacket(new Packet201PlayerInfo(entityplayer1.listName, true, entityplayer1.i)); + entityplayer.netServerHandler.sendPacket(new Packet201PlayerInfo(entityplayer1.listName, true, entityplayer1.ping)); // CraftBukkit end } } @@ -161,7 +161,7 @@ public class ServerConfigurationManager { this.cserver.getPluginManager().callEvent(playerQuitEvent); // CraftBukkit end - this.playerFileData.a(entityplayer); + this.playerFileData.save(entityplayer); this.server.getWorldServer(entityplayer.dimension).kill(entityplayer); this.players.remove(entityplayer); this.getPlayerManager(entityplayer.dimension).removePlayer(entityplayer); @@ -272,13 +272,13 @@ public class ServerConfigurationManager { worldserver.chunkProviderServer.getChunkAt((int) entityplayer1.locX >> 4, (int) entityplayer1.locZ >> 4); - while (worldserver.getEntities(entityplayer1, entityplayer1.boundingBox).size() != 0) { + while (worldserver.a(entityplayer1, entityplayer1.boundingBox).size() != 0) { entityplayer1.setPosition(entityplayer1.locX, entityplayer1.locY + 1.0D, entityplayer1.locZ); } // CraftBukkit start byte actualDimension = (byte) (worldserver.getWorld().getEnvironment().getId()); - entityplayer1.netServerHandler.sendPacket(new Packet9Respawn(actualDimension, (byte) worldserver.difficulty, worldserver.getSeed(), worldserver.height, entityplayer1.itemInWorldManager.a())); + entityplayer1.netServerHandler.sendPacket(new Packet9Respawn(actualDimension, (byte) worldserver.difficulty, worldserver.getSeed(), worldserver.height, entityplayer1.itemInWorldManager.getGameMode())); entityplayer1.spawnIn(worldserver); entityplayer1.dead = false; entityplayer1.netServerHandler.teleport(new Location(worldserver.getWorld(), entityplayer1.locX, entityplayer1.locY, entityplayer1.locZ, entityplayer1.yaw, entityplayer1.pitch)); @@ -671,7 +671,7 @@ public class ServerConfigurationManager { public void savePlayers() { for (int i = 0; i < this.players.size(); ++i) { - this.playerFileData.a((EntityHuman) this.players.get(i)); + this.playerFileData.save((EntityHuman) this.players.get(i)); } } @@ -705,7 +705,7 @@ public class ServerConfigurationManager { public void updateClient(EntityPlayer entityplayer) { entityplayer.updateInventory(entityplayer.defaultContainer); entityplayer.s_(); - entityplayer.cf = -1; // CraftBukkit + entityplayer.lastSentExp = -1; // CraftBukkit } public int getPlayerCount() { |