Fix exceptions when DLC info hasn't loaded yet.

Gwindalmir · May 12, 2024 · 85e5e34 · 85e5e34
1 parent 011444c
commit 85e5e34
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/WorkshopToolCommon/Extensions/Extensions.cs b/WorkshopToolCommon/Extensions/Extensions.cs
@@ -308,11 +308,19 @@ public static class MyDLCExtensions
         public static uint TryGetDLC(this string dlc)
         {
 #if SE
-            Sandbox.Game.MyDLCs.MyDLC dlcvalue;
-            if (Sandbox.Game.MyDLCs.TryGetDLC(dlc, out dlcvalue))
-                return dlcvalue.AppId;
-            else
+            VRage.Game.Definitions.MyDlcDefinition dlcvalue;
+            try
+            {
+                if (Sandbox.Game.MyDLCs.TryGetDLC(dlc, out dlcvalue))
+                    return dlcvalue.AppId;
+                else
+                    return 0;
+            }
+            catch(NullReferenceException)
+            {
+                MySandboxGame.Log.WriteLineWarning($"Could not look up DLC with name '{dlc}'. As of SE version 1.204, name lookups are not available. Please use the AppId when specifying DLC instead. Valid AppIds are found in '{Path.Combine(MyModContext.BaseGame.ModPathData, "Game", "DLCs.sbc")}'.");
                 return 0;
+            }
 #else
             return 0;
 #endif

diff --git a/WorkshopToolCommon/GameBase.cs b/WorkshopToolCommon/GameBase.cs
@@ -1039,9 +1039,16 @@ private void ListDLCs()
         {
 #if SE
             MySandboxGame.Log.WriteLineAndConsole("Valid DLC:");
-            foreach (var dlc in Sandbox.Game.MyDLCs.DLCs.Values)
+            try
+            {
+                foreach (var dlc in Sandbox.Game.MyDLCs.DLCs.Values)
+                {
+                    MySandboxGame.Log.WriteLineAndConsole($"Name: {dlc.Name}, ID: {dlc.AppId}");
+                }
+            }
+            catch(NullReferenceException)
             {
-                MySandboxGame.Log.WriteLineAndConsole($"Name: {dlc.Name}, ID: {dlc.AppId}");
+                MySandboxGame.Log.WriteLineWarning($"This option is no longer available as of SE version 1.204.\nValid DLC AppIds are in '{Path.Combine(MyModContext.BaseGame.ModPathData, "Game", "DLCs.sbc")}'.");
             }
 #endif
         }