fix connection errors

1 files changed, 12 insertions, 7 deletions

diff --git a/webAO/client.ts b/webAO/client.ts
index 2f94bae..5b37c81 100644
--- a/webAO/client.ts
+++ b/webAO/client.ts
@@ -62,10 +62,7 @@ export const setExtraFeatures = (val: any) => {
   extrafeatures = val;
 };
 
-export let banned: boolean = false;
-export const setBanned = (val: boolean) => {
-  banned = val;
-};
+
 let hdid: string;
 
 const fpPromise = FingerprintJS.load();
@@ -183,6 +180,7 @@ class Client extends EventEmitter {
       }
     };
 
+    this.banned = false;
     this.hp = [0, 0];
     this.playerID = 1;
     this.charID = -1;
@@ -276,13 +274,20 @@ class Client extends EventEmitter {
   onClose(e: CloseEvent) {
     client.state = clientState.NotConnected;
     console.error(`The connection was closed: ${e.reason} (${e.code})`);
-    if (extrafeatures.length == 0 && banned === false) {
+    console.log(this.areas.length);
+    console.log(this.banned);
+    if (this.banned === false) {
+      if (this.areas.length > 0) {
       document.getElementById("client_errortext").textContent =
-        "Could not connect to the server";
+        "You were disconnected from the server.";
+      } else {
+      document.getElementById("client_errortext").textContent =
+        "Could not connect to the server.";
+      }
     }
     document.getElementById("client_waiting").style.display = "block";
     document.getElementById("client_error").style.display = "flex";
-    document.getElementById("client_loading").style.display = "none";
+    document.getElementById("client_loading").style.display = "none";    
     document.getElementById("error_id").textContent = String(e.code);
     this.cleanup();
   }