diff options
| -rw-r--r-- | src/main/java/net/minecraft/server/NetLoginHandler.java | 2 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/ServerConfigurationManager.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/NetLoginHandler.java b/src/main/java/net/minecraft/server/NetLoginHandler.java index 9b02268b..c91f6087 100644 --- a/src/main/java/net/minecraft/server/NetLoginHandler.java +++ b/src/main/java/net/minecraft/server/NetLoginHandler.java @@ -102,7 +102,7 @@ public class NetLoginHandler extends NetHandler { EntityPlayer entityplayer = this.server.serverConfigurationManager.attemptLogin(this, packet1login.name, this.hostname); // CraftBukkit - add hostname parameter if (entityplayer != null) { - this.server.serverConfigurationManager.b(entityplayer); + //this.server.serverConfigurationManager.b(entityplayer); // CraftBukkit - Moved to attemptLogin // entityplayer.a((World) this.server.a(entityplayer.dimension)); // CraftBukkit - set by Entity entityplayer.itemInWorldManager.a((WorldServer) entityplayer.world); // CraftBukkit - add world and location to 'logged in' message. diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java index 7bd85ea7..b765faf7 100644 --- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java +++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java @@ -213,7 +213,6 @@ public class ServerConfigurationManager { if (this.banByName.contains(s.trim().toLowerCase())) { event.disallow(PlayerLoginEvent.Result.KICK_BANNED, "You are banned from this server!"); - // return null // CraftBukkit } else if (!this.isWhitelisted(s)) { event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, "You are not white-listed on this server!"); } else if (this.banByIP.contains(s1)) { @@ -224,6 +223,7 @@ public class ServerConfigurationManager { event.disallow(PlayerLoginEvent.Result.ALLOWED, s1); } + this.b(entity); this.cserver.getPluginManager().callEvent(event); if (event.getResult() != PlayerLoginEvent.Result.ALLOWED) { netloginhandler.disconnect(event.getKickMessage()); @@ -235,6 +235,7 @@ public class ServerConfigurationManager { if (entityplayer.name.equalsIgnoreCase(s)) { entityplayer.netServerHandler.disconnect("You logged in from another location"); + this.b(entity); } } |