1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/ThreadPlayerLookupUUID.java b/src/main/java/net/minecraft/server/ThreadPlayerLookupUUID.java
index cc967758..f48ce534 100644
--- a/src/main/java/net/minecraft/server/ThreadPlayerLookupUUID.java
+++ b/src/main/java/net/minecraft/server/ThreadPlayerLookupUUID.java
@@ -22,12 +22,12 @@ class ThreadPlayerLookupUUID extends Thread {
 
     public void run() {
         try {
-            String s = (new BigInteger(MinecraftEncryption.a(LoginListener.a(this.a), LoginListener.b(this.a).I().getPublic(), LoginListener.c(this.a)))).toString(16);
+            String s = (new BigInteger(MinecraftEncryption.a(LoginListener.a(this.a), LoginListener.b(this.a).J().getPublic(), LoginListener.c(this.a)))).toString(16);
 
-            LoginListener.a(this.a, LoginListener.b(this.a).as().hasJoinedServer(new GameProfile((String) null, LoginListener.d(this.a).getName()), s));
+            LoginListener.a(this.a, LoginListener.b(this.a).at().hasJoinedServer(new GameProfile((String) null, LoginListener.d(this.a).getName()), s));
             if (LoginListener.d(this.a) != null) {
-                // CraftBukkit start
-                if (!this.a.networkManager.d()) {
+                // CraftBukkit start - fire PlayerPreLoginEvent
+                if (!this.a.networkManager.isConnected()) {
                     return;
                 }
 
@@ -72,7 +72,7 @@ class ThreadPlayerLookupUUID extends Thread {
         } catch (AuthenticationUnavailableException authenticationunavailableexception) {
             this.a.disconnect("Authentication servers are down. Please try again later, sorry!");
             LoginListener.e().error("Couldn\'t verify username because servers are unavailable");
-            // CraftBukkit start
+            // CraftBukkit start - catch all exceptions
         } catch (Exception exception) {
             this.a.disconnect("Failed to verify username!");
             LoginListener.b(this.a).server.getLogger().log(java.util.logging.Level.WARNING, "Exception verifying " + LoginListener.d(this.a).getName(), exception);