fix: Correct the editor reconnect attempt timer in the most hideous o…

…f ways (#1943)
AscensionGameDev · Oct 13, 2023 · 6a9f5f3 · 6a9f5f3
1 parent 2019765
commit 6a9f5f3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/Intersect.Editor/Forms/frmLogin.cs b/Intersect.Editor/Forms/frmLogin.cs
@@ -102,7 +102,7 @@ private void tmrSocket_Tick(object sender, EventArgs e)
                 NetworkStatus.Unknown => Strings.Login.Denied,
                 NetworkStatus.Connecting => Strings.Login.connecting,
                 NetworkStatus.Online => Strings.Login.connected,
-                NetworkStatus.Offline => Strings.Login.failedtoconnect.ToString(((Globals.ReconnectTime - Timing.Global.MillisecondsUtc) / 1000).ToString("0")),
+                NetworkStatus.Offline => Strings.Login.failedtoconnect.ToString(((Globals.NextServerStatusPing - Timing.Global.MillisecondsUtc) / 1000).ToString("0")),
                 NetworkStatus.Failed => Strings.Login.Denied,
                 NetworkStatus.VersionMismatch => Strings.Login.Denied,
                 NetworkStatus.ServerFull => Strings.Login.Denied,

diff --git a/Intersect.Editor/General/Globals.cs b/Intersect.Editor/General/Globals.cs
@@ -131,6 +131,8 @@ public static partial class Globals
         //Network Variables
         public static int ReconnectTime = 3000;
 
+        public static long NextServerStatusPing;
+
         //Game Object Editors
         public static FrmResource ResourceEditor;
 

diff --git a/Intersect.Editor/Networking/Network.cs b/Intersect.Editor/Networking/Network.cs
@@ -222,6 +222,7 @@ public static void Update()
                     }
 
                     _nextServerStatusPing = now + ServerStatusPingInterval;
+                    Globals.NextServerStatusPing = _nextServerStatusPing;
                 }
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -222,6 +222,7 @@ public static void Update() @@
                         }
                         _nextServerStatusPing = now + ServerStatusPingInterval;
+                        Globals.NextServerStatusPing = _nextServerStatusPing;
                     }
                 }
@@ Expand Down @@