fix: Default ping for VPN cases as well as exception handling on navg…

…raph generation
nt153133 · Mar 17, 2024 · b67cc4d · b67cc4d
1 parent 48d57c9
commit b67cc4d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/Helpers/Navigation.cs b/Helpers/Navigation.cs
@@ -34,10 +34,18 @@ public static class Navigation
 
         public static readonly WaitTimer WaitTimer_0 = new(new TimeSpan(0, 0, 0, 15));
 
-        internal static async Task<Queue<NavGraph.INode>> GenerateNodes(uint ZoneId, Vector3 xyz)
+        internal static async Task<Queue<NavGraph.INode>?> GenerateNodes(uint ZoneId, Vector3 xyz)
         {
             Log.Information($"Getpath {ZoneId} {xyz}");
-            return await NavGraph.GetPathAsync(ZoneId, xyz);
+            try
+            {
+                return await NavGraph.GetPathAsync(ZoneId, xyz);
+            }
+            catch (Exception ex)
+            {
+                Log.Error($"NavGraph.GetPathAsync failed with an exception");
+                return null;
+            }
         }
 
         public static async Task<bool> GetTo(Location location)

diff --git a/Helpers/Ping/PingChecker.cs b/Helpers/Ping/PingChecker.cs
@@ -66,6 +66,13 @@ public static async Task UpdatePing()
                 }
             }
 
+            if (ip.Equals(IPAddress.Loopback))
+            {
+                CurrentPing = 100;
+                lastWorld = WorldHelper.CurrentWorldId;
+                return;
+            }
+
             CurrentPing = (int)await PingTimeAverage(ip.ToString(), 3);
             lastWorld = WorldHelper.CurrentWorldId;
         }