diff options
author | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-11-29 23:17:43 +0000 |
---|---|---|
committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-11-30 21:46:19 +0000 |
commit | 8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792 (patch) | |
tree | cc229f65097c54cfcd769f686c43efa1dacc8d2f /src/main/java/net/minecraft/server/NetLoginHandler.java | |
parent | 8665161eaa0160467ce33598c13f1aed4b549a4d (diff) | |
download | craftbukkit-8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792.tar craftbukkit-8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792.tar.gz craftbukkit-8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792.tar.lz craftbukkit-8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792.tar.xz craftbukkit-8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792.zip |
Updated to use mc-dev rename revision 1
Diffstat (limited to 'src/main/java/net/minecraft/server/NetLoginHandler.java')
-rw-r--r-- | src/main/java/net/minecraft/server/NetLoginHandler.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/NetLoginHandler.java b/src/main/java/net/minecraft/server/NetLoginHandler.java index 1b00ff40..e10062ab 100644 --- a/src/main/java/net/minecraft/server/NetLoginHandler.java +++ b/src/main/java/net/minecraft/server/NetLoginHandler.java @@ -85,7 +85,7 @@ public class NetLoginHandler extends NetHandler { } public void b(Packet1Login packet1login) { - EntityPlayer entityplayer = this.server.serverConfigurationManager.a(this, packet1login.name); + EntityPlayer entityplayer = this.server.serverConfigurationManager.attemptLogin(this, packet1login.name); if (entityplayer != null) { this.server.serverConfigurationManager.b(entityplayer); @@ -96,11 +96,11 @@ public class NetLoginHandler extends NetHandler { WorldServer worldserver = (WorldServer) entityplayer.world; // CraftBukkit ChunkCoordinates chunkcoordinates = worldserver.getSpawn(); - entityplayer.itemInWorldManager.b(worldserver.r().getGameType()); + entityplayer.itemInWorldManager.b(worldserver.getWorldData().getGameType()); NetServerHandler netserverhandler = new NetServerHandler(this.server, this.networkManager, entityplayer); // CraftBukkit start -- Don't send a higher than 60 MaxPlayer size, otherwise the PlayerInfo window won't render correctly. - int maxPlayers = this.server.serverConfigurationManager.k(); + int maxPlayers = this.server.serverConfigurationManager.getMaxPlayers(); if (maxPlayers > 60) { maxPlayers = 60; } @@ -137,8 +137,8 @@ public class NetLoginHandler extends NetHandler { if (this.networkManager.f() == null) return; // CraftBukkit - fix NPE when a client queries a server that is unable to handle it. try { // CraftBukkit start - ServerListPingEvent pingEvent = CraftEventFactory.callServerListPingEvent(this.server.server, getSocket().getInetAddress(), this.server.r, this.server.serverConfigurationManager.j(), this.server.serverConfigurationManager.k()); - String s = pingEvent.getMotd() + "\u00A7" + this.server.serverConfigurationManager.j() + "\u00A7" + pingEvent.getMaxPlayers(); + ServerListPingEvent pingEvent = CraftEventFactory.callServerListPingEvent(this.server.server, getSocket().getInetAddress(), this.server.r, this.server.serverConfigurationManager.getPlayerCount(), this.server.serverConfigurationManager.getMaxPlayers()); + String s = pingEvent.getMotd() + "\u00A7" + this.server.serverConfigurationManager.getPlayerCount() + "\u00A7" + pingEvent.getMaxPlayers(); // CraftBukkit end this.networkManager.queue(new Packet255KickDisconnect(s)); |