Fix get verb not working

Gwindalmir · Sep 18, 2021 · 7e4de01 · 7e4de01
1 parent a60fe69
commit 7e4de01
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/WorkshopToolCommon/GameBase.cs b/WorkshopToolCommon/GameBase.cs
@@ -745,13 +745,13 @@ static System.Threading.Tasks.Task<bool> DownloadMods(ProcessedOptions options)
                 MySandboxGame.Log.WriteLineAndConsole("Beginning batch workshop download...");
                 MySandboxGame.Log.WriteLineAndConsole(string.Empty);
 
-                if (options.Collections?.Count() > 0)
+                if (options.Collections?.Count() > 0 || options.Ids?.Count() > 0)
                 {
                     var items = new List<MyWorkshopItem>();
 
                     // get collection information
-                    options.Collections.ForEach(i => items.AddRange(WorkshopHelper.GetCollectionDetails(i)));
-                    WorkshopHelper.GetItemsBlocking(options.Ids).ForEach(item =>
+                    options.Collections?.ForEach(i => items.AddRange(WorkshopHelper.GetCollectionDetails(i)));
+                    WorkshopHelper.GetItemsBlocking(options?.Ids)?.ForEach(item =>
                     {
                         // Ids can contain any workshop id, including collections, so check each one
                         if (item.ItemType == MyWorkshopItemType.Collection)
@@ -1007,7 +1007,7 @@ static string[] CombineCollectionWithList(WorkshopType type, List<MyWorkshopItem
 
                 return tempList.ToArray();
             }
-            return existingitems.ToArray();
+            return existingitems?.ToArray();
         }
 
         public static void CopyAll(string source, string target)

diff --git a/WorkshopToolCommon/WorkshopHelper.cs b/WorkshopToolCommon/WorkshopHelper.cs
@@ -96,6 +96,8 @@ public static MyWorkshopItem GetItemBlocking(ulong id)
 
         public static List<MyWorkshopItem> GetItemsBlocking(ICollection<ulong> ids)
         {
+            if (ids == null)
+                return null;
 #if SE
             var workshopIds = new List<WorkshopId>();
             ids.ForEach(i => workshopIds.Add(new WorkshopId(i, MyGameService.GetDefaultUGC().ServiceName)));