From 5ed9c2082f67b1267e507da46629354634515a13 Mon Sep 17 00:00:00 2001 From: Christopher Bailey Date: Fri, 9 Apr 2021 17:29:15 -0400 Subject: [PATCH] Fixes error loading non-US worlds --- BoundlessProxyUi/Mitm/SslMitmInstance.cs | 10 +++++++++- BoundlessProxyUi/Properties/AssemblyInfo.cs | 4 ++-- .../ProxyManager/Components/HostsComponent.cs | 6 +++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/BoundlessProxyUi/Mitm/SslMitmInstance.cs b/BoundlessProxyUi/Mitm/SslMitmInstance.cs index ae62f68..72965a4 100644 --- a/BoundlessProxyUi/Mitm/SslMitmInstance.cs +++ b/BoundlessProxyUi/Mitm/SslMitmInstance.cs @@ -113,7 +113,15 @@ public static async Task InitPlanets(Dictionary hostLookup) string addr = something["address"].Value(); string ipAddr = hostLookup[addr]; - planetLookup.Add(planetId, new KeyValuePair(planetName, planetNum)); + try + { + planetLookup.Add(planetId, new KeyValuePair(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 index b52370e..77be58e 100644 --- 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 index e815d48..1113124 100644 --- 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)