Fix blueprint loading crash with units with no categories (#6281)

Fix `ExtractCloakMeshBlueprint` (which assumes Categories) being called on a unit without a Categories bp table. Fix a crash when the "Weak" weapon categories are being assigned to a unit without a Categories bp table. Co-authored-by: lL1l1 <[email protected]>
FAForever · Oct 12, 2024 · c95b42a · c95b42a
1 parent 6261cc0
commit c95b42a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/changelog/snippets/fix.6281.md b/changelog/snippets/fix.6281.md
@@ -0,0 +1,3 @@
+- (#6281) Fix two errors during blueprint loading when a unit has no Categories table in its blueprint.
+    - `ExtractCloakMeshBlueprint`-related error.
+    - Automatic category assignment for the "Weak" weapon categories.
diff --git a/lua/system/Blueprints.lua b/lua/system/Blueprints.lua
@@ -764,10 +764,9 @@ end
 ---@param all_bps BlueprintsTable All the blueprints of the game.
 function PreModBlueprints(all_bps)
     for _, bp in all_bps.Unit do
-        ExtractCloakMeshBlueprint(bp)
-
         -- Units with no categories are skipped
         if bp.Categories then
+            ExtractCloakMeshBlueprint(bp)
 
             -- Construct hash-based categories
             bp.CategoriesHash = table.hash(bp.Categories)

diff --git a/lua/system/blueprints-units.lua b/lua/system/blueprints-units.lua
@@ -507,6 +507,10 @@ local function PostProcessUnit(unit)
         table.sort(array, function(e1, e2) return e1.Damage > e2.Damage end)
         local factor = array[1].Damage
 
+        if not unit.Categories then
+            unit.Categories = {}
+        end
+
         for category, damage in pairs(damagePerRangeCategory) do
             if damage > 0 then
                 local cat = "OVERLAY" .. category