Handle incorrect password better

DenizenScript · Oct 12, 2016 · b60ead9 · b60ead9
1 parent 372cfce
commit b60ead9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/common/src/main/java/com/denizenscript/depenizen/common/socket/client/SocketClient.java b/common/src/main/java/com/denizenscript/depenizen/common/socket/client/SocketClient.java
@@ -115,7 +115,6 @@ public void close(String reason, boolean shouldReconnect) {
 
     public void attemptReconnect() {
         if (!isConnected && reconnectThread == null) {
-            Depenizen.getImplementation().debugMessage("Attempting to reconnect...");
             reconnectThread = new Thread(new ReconnectTask(this, getReconnectAttempts(), getReconnectDelay()));
             reconnectThread.start();
         }
@@ -256,14 +255,16 @@ public void run() {
                 }
                 listenThread = null;
             }
-            catch (IllegalStateException e) {
-                close("Password is incorrect", false);
-            }
             catch (SocketTimeoutException e) {
                 close("Connection timed out", true);
             }
             catch (IOException e) {
-                close("Server socket closed", true);
+                if (!isRegistered()) {
+                    close("Server socket closed the connection during registration. Incorrect password?", false);
+                }
+                else {
+                    close("Server socket closed", true);
+                }
             }
             catch (InterruptedException e) {
                 // Assume this is intentional

diff --git a/common/src/main/java/com/denizenscript/depenizen/common/socket/server/ClientConnection.java b/common/src/main/java/com/denizenscript/depenizen/common/socket/server/ClientConnection.java
@@ -7,6 +7,7 @@
 import com.denizenscript.depenizen.common.socket.server.packet.*;
 import com.denizenscript.depenizen.common.util.Utilities;
 
+import javax.crypto.BadPaddingException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -269,7 +270,7 @@ public void run() {
                     }
                 }
             }
-            catch (IllegalStateException e) {
+            catch (BadPaddingException e) {
                 server.removeClient(clientId, "Password is incorrect");
             }
             catch (IOException e) {