Fixes error loading non-US worlds

AngellusMortis · Apr 9, 2021 · 5ed9c20 · 5ed9c20
1 parent 0fe6cc4
commit 5ed9c20
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/BoundlessProxyUi/Mitm/SslMitmInstance.cs b/BoundlessProxyUi/Mitm/SslMitmInstance.cs
@@ -113,7 +113,15 @@ public static async Task InitPlanets(Dictionary<string, string> hostLookup)
                 string addr = something["address"].Value<string>();
                 string ipAddr = hostLookup[addr];
 
-                planetLookup.Add(planetId, new KeyValuePair<string, int>(planetName, planetNum));
+                try
+                {
+                    planetLookup.Add(planetId, new KeyValuePair<string, int>(planetName, planetNum));
+                }
+                catch (System.ArgumentException)
+                {
+                    System.Diagnostics.Debug.WriteLine("Duplicate planet: {1}", planetId);
+                }
+
 
                 UdpProxy proxy = null;
 

diff --git a/BoundlessProxyUi/Properties/AssemblyInfo.cs b/BoundlessProxyUi/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0")]
-[assembly: AssemblyFileVersion("1.5.0")]
+[assembly: AssemblyVersion("1.5.1")]
+[assembly: AssemblyFileVersion("1.5.1")]
diff --git a/BoundlessProxyUi/ProxyManager/Components/HostsComponent.cs b/BoundlessProxyUi/ProxyManager/Components/HostsComponent.cs
@@ -163,9 +163,9 @@ public override string Start()
 
                     string[] hosts = new string[]{
                             $"{ProxyManagerConfig.Instance.BoundlessServerPrefix}-usw{{0}}.playboundless.com",
-                            $"{ProxyManagerConfig.Instance.BoundlessServerPrefix}-live-use{{0}}.playboundless.com",
-                            $"{ProxyManagerConfig.Instance.BoundlessServerPrefix}-live-euc{{0}}.playboundless.com",
-                            $"{ProxyManagerConfig.Instance.BoundlessServerPrefix}-live-aus{{0}}.playboundless.com",
+                            $"{ProxyManagerConfig.Instance.BoundlessServerPrefix}-use{{0}}.playboundless.com",
+                            $"{ProxyManagerConfig.Instance.BoundlessServerPrefix}-euc{{0}}.playboundless.com",
+                            $"{ProxyManagerConfig.Instance.BoundlessServerPrefix}-aus{{0}}.playboundless.com",
                         };
 
                     foreach (string curHostPattern in hosts)