fix: disconnection error when returning to main menu (AscensionGameDev#2257)

Author: WeylonSantana

Intersect (Core)/Network/Packets/Client/LogoutPacket.cs

@@ -10,14 +10,18 @@ public LogoutPacket()
         {
         }
 
-        public LogoutPacket(bool returnToCharSelect)
+        public LogoutPacket(bool returnToCharSelect, bool returnToMainMenu)
         {
             ReturningToCharSelect = returnToCharSelect;
+            ReturningToMainMenu = returnToMainMenu;
         }
 
         [Key(0)]
         public bool ReturningToCharSelect { get; set; }
 
+        [Key(1)]
+        public bool ReturningToMainMenu { get; set; }
+
     }
 
 }

Intersect.Client/Core/Main.cs

@@ -194,11 +194,8 @@ private static void ProcessGame()
         {
             if (Globals.ConnectionLost)
             {
-                Main.Logout(false);
-                Interface.Interface.ShowError(Strings.Errors.LostConnection);
-
+                Logout(false, true);
                 Globals.ConnectionLost = false;
-
                 return;
             }
 
@@ -328,7 +325,7 @@ public static void JoinGame()
             Audio.StopMusic(ClientConfiguration.Instance.MusicFadeTimer);
         }
 
-        public static void Logout(bool characterSelect, bool skipFade = false)
+        public static void Logout(bool characterSelect, bool mainMenu, bool skipFade = false)
         {
             Audio.PlayMusic(ClientConfiguration.Instance.MenuMusic, ClientConfiguration.Instance.MusicFadeTimer, ClientConfiguration.Instance.MusicFadeTimer, true);
             if (skipFade)
@@ -342,7 +339,7 @@ public static void Logout(bool characterSelect, bool skipFade = false)
 
             if (!ClientContext.IsSinglePlayer)
             {
-                PacketSender.SendLogout(characterSelect);
+                PacketSender.SendLogout(characterSelect, mainMenu);
             }
 
             Globals.LoggedIn = false;

Intersect.Client/Interface/Game/EscapeMenu.cs

@@ -149,7 +149,7 @@ private void LogoutToCharacterSelect(object sender, EventArgs e)
                 Globals.Me.CombatTimer = 0;
             }
 
-            Main.Logout(true);
+            Main.Logout(true, false);
         }
 
         private void LogoutToMainMenu(object sender, EventArgs e)
@@ -159,7 +159,7 @@ private void LogoutToMainMenu(object sender, EventArgs e)
                 Globals.Me.CombatTimer = 0;
             }
 
-            Main.Logout(false);
+            Main.Logout(false, true);
         }
 
         private void ExitToDesktop(object sender, EventArgs e)

Intersect.Client/Interface/Menu/CreateCharacterWindow.cs

@@ -204,8 +204,6 @@ public void Update()
             {
                 Hide();
                 mMainMenu.Show();
-                Interface.ShowError(Strings.Errors.LostConnection);
-
                 return;
             }
 

Intersect.Client/Interface/Menu/ForgotPasswordWindow.cs

@@ -102,7 +102,6 @@ public void Update()
             {
                 Hide();
                 mMainMenu.Show();
-                Interface.ShowError(Strings.Errors.LostConnection);
             }
 
             // Re-Enable our buttons if we're not waiting for the server anymore with it disabled.

Intersect.Client/Interface/Menu/RegisterWindow.cs

@@ -153,7 +153,6 @@ public void Update()
             {
                 Hide();
                 mMainMenu.Show();
-                Interface.ShowError(Strings.Errors.LostConnection);
             }
 
             // Re-Enable our buttons if we're not waiting for the server anymore with it disabled.

Intersect.Client/Interface/Menu/ResetPasswordWindow.cs

@@ -144,7 +144,6 @@ public void Update()
             {
                 Hide();
                 mMainMenu.Show();
-                Interface.ShowError(Strings.Errors.LostConnection);
             }
         }
 

Intersect.Client/Interface/Menu/SelectCharacterWindow.cs

@@ -123,7 +123,6 @@ public void Update()
             {
                 Hide();
                 mMainMenu.Show();
-                Interface.ShowError(Strings.Errors.LostConnection);
             }
 
             // Re-Enable our buttons if we're not waiting for the server anymore with it disabled.
@@ -344,7 +343,7 @@ public void Hide()
 
         private void mLogoutButton_Clicked(Base sender, ClickedEventArgs arguments)
         {
-            Main.Logout(false, skipFade: true);
+            Main.Logout(false, true, skipFade: true);
             mMainMenu.Reset();
         }
 

Intersect.Client/Networking/PacketSender.cs

@@ -28,9 +28,9 @@ public static void SendLogin(string username, string password)
             Network.SendPacket(new LoginPacket(username, password));
         }
 
-        public static void SendLogout(bool characterSelect = false)
+        public static void SendLogout(bool characterSelect = false, bool mainMenu = true)
         {
-            Network.SendPacket(new LogoutPacket(characterSelect));
+            Network.SendPacket(new LogoutPacket(characterSelect, mainMenu));
         }
 
         public static void SendNeedMap(params ObjectCacheKey<MapBase>[] cacheKeys)

Intersect.Server.Core/Networking/PacketHandler.cs

@@ -663,6 +663,13 @@ public void HandlePacket(Client client, LogoutPacket packet)
                 client.Entity = default;
                 PacketSender.SendPlayerCharacters(client, skipLoadingRelationships: true);
             }
+            else if(packet.ReturningToMainMenu)
+            {
+                Log.Debug($"[{nameof(LogoutPacket)}] Returning to main menu from player {client.Entity?.Id} ({client.User?.Id})");
+                client.Entity?.TryLogout(false, true);
+                client.Entity = default;
+                client.SetUser(null);
+            }
             else
             {
                 client.Logout();