Make unknown ports not throw

Arkhist · Sep 12, 2021 · 4d18979 · 4d18979
1 parent dbc2d66
commit 4d18979
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/PathfinderAPI/Port/PortManager.cs b/PathfinderAPI/Port/PortManager.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using BepInEx.Logging;
 using Pathfinder.Event;
 using Hacknet;
 using Hacknet.Security;
@@ -61,7 +62,7 @@ public static void LoadPortsFromString(Computer comp, string portString, bool cl
         {
             if (clearExisting)
                 comp.ClearPorts();
-            foreach (var port in portString.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries))
+            foreach (var port in portString.Split(new char[] { ' ', ',' }, StringSplitOptions.RemoveEmptyEntries))
             {
                 var portParts = port.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries);
                 if (portParts.Length == 1)
@@ -102,7 +103,12 @@ public static void LoadPortsFromStringVanilla(Computer comp, string portsList)
                 if (!int.TryParse(port, out var portNum))
                     throw new FormatException($"Failed to parse port number from '{port}'");
                 var data = GetPortDataFromNumber(portNum);
-                comp.AddPort(data?.Clone() ?? throw new ArgumentException($"No port has the default {port}"));
+                if (data == null)
+                {
+                    Logger.Log(LogLevel.Warning, $"{comp.idName} has port {port}, which does not exist");
+                    continue;
+                }
+                comp.AddPort(data.Clone());
             }
         }