From a360b2eee30488ade5f45a44638bc4e01e427ed0 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 7 Sep 2023 06:17:32 +0300
Subject: [PATCH] forcefully disconnect from server

---
 src/menus/pause_screen.js | 2 +-
 src/utils.js              | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/menus/pause_screen.js b/src/menus/pause_screen.js
index d6091b0f..97f8706b 100644
--- a/src/menus/pause_screen.js
+++ b/src/menus/pause_screen.js
@@ -71,7 +71,7 @@ class PauseScreen extends LitElement {
           <pmui-button pmui-width="98px" pmui-label="Discord" @pmui-click=${() => openURL('https://discord.gg/4Ucm684Fq3')}></pmui-button>
         </div>
         <pmui-button pmui-width="204px" pmui-label="Options" @pmui-click=${() => showModal(document.getElementById('options-screen'))}></pmui-button>
-        <pmui-button pmui-width="204px" pmui-label="${!fsState.syncFs && !fsState.isReadonly ? 'Save & Quit' : 'Disconnect'}" @pmui-click=${async () => {
+        <pmui-button pmui-width="204px" pmui-label="${localServer && !fsState.syncFs && !fsState.isReadonly ? 'Save & Quit' : 'Disconnect'}" @pmui-click=${async () => {
         disconnect()
       }}></pmui-button>
       </main>
diff --git a/src/utils.js b/src/utils.js
index 4d989f59..682d40fd 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -153,8 +153,12 @@ export const disconnect = async () => {
   if (window.localServer) {
     await saveWorld()
     localServer.quit()
+  } else {
+    // workaround bot.end doesn't end the socket and emit end event
+    bot.end()
+    bot._client.socket.end()
   }
-  bot._client.emit('end')
+  bot._client.emit('end', 'You left the server')
   miscUiState.gameLoaded = false
 }