From e00efbf53d8094e28e50f39f51c636655b8614df Mon Sep 17 00:00:00 2001 From: GeorgeD64 Date: Mon, 23 Aug 2021 23:13:48 +1000 Subject: [PATCH] Added map name support to Launch.Map command line parameter Fixed code based on feedback Replaced try/catch block with a null check and exception throw Fixed code based on feedback Fixed code based on feedback Simplified Launch.Map parameter to use map name directly --- OpenRA.Game/Game.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index 1d61b4610b..ffd0115004 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -953,12 +953,9 @@ namespace OpenRA Order.Command($"state {Session.ClientState.Ready}") }; - var path = Platform.ResolvePath(launchMap); - var map = ModData.MapCache.SingleOrDefault(m => m.Uid == launchMap) ?? - ModData.MapCache.SingleOrDefault(m => m.Package.Name == path); - + var map = ModData.MapCache.SingleOrDefault(m => m.Uid == launchMap || Path.GetFileName(m.Package.Name) == launchMap); if (map == null) - throw new InvalidOperationException($"Could not find map '{launchMap}'."); + throw new ArgumentException($"Could not find map '{launchMap}'."); CreateAndStartLocalServer(map.Uid, orders); }