From 71439fb5a9c8e898090fd3ca3431a418e0d6eb1e Mon Sep 17 00:00:00 2001 From: FAForever Date: Thu, 26 Sep 2024 21:13:35 +0000 Subject: [PATCH 1/4] Post-process deployment --- lua/shared/components/DebugComponent.lua | 2 +- lua/version.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/shared/components/DebugComponent.lua b/lua/shared/components/DebugComponent.lua index 6ceb164723..f4d623c940 100644 --- a/lua/shared/components/DebugComponent.lua +++ b/lua/shared/components/DebugComponent.lua @@ -35,7 +35,7 @@ DebugComponent = ClassSimple { EnabledLogging = true, EnabledWarnings = true, EnabledErrors = true, - EnabledDrawing = true, + EnabledDrawing = false, --#endregion } diff --git a/lua/version.lua b/lua/version.lua index 6449b4ecee..51ce54c7d9 100644 --- a/lua/version.lua +++ b/lua/version.lua @@ -28,9 +28,9 @@ -- - https://github.com/FAForever/fa/blob/develop/.github/workflows/deploy-fafbeta.yaml -- - https://github.com/FAForever/fa/blob/develop/.github/workflows/deploy-fafdevelop.yaml -local GameType = 'unknown' -- The use of `'` instead of `"` is **intentional** +local GameType = "FAF Develop" -- The use of `'` instead of `"` is **intentional** -local Commit = 'unknown' -- The use of `'` instead of `"` is **intentional** +local Commit = "c3fc75df99384898155603403f9eca80285657fb" -- The use of `'` instead of `"` is **intentional** --#endregion From c00e2ce1a439766da4f48592bc961d4036234090 Mon Sep 17 00:00:00 2001 From: Sean Wheeldon Date: Mon, 30 Sep 2024 10:50:08 +0100 Subject: [PATCH 2/4] Update blueprints-units.lua Fixed a crash if a unit has an enhancements table but not an intel table. --- lua/system/blueprints-units.lua | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/lua/system/blueprints-units.lua b/lua/system/blueprints-units.lua index 6af989b396..628096df5b 100644 --- a/lua/system/blueprints-units.lua +++ b/lua/system/blueprints-units.lua @@ -395,17 +395,19 @@ local function PostProcessUnit(unit) -- usual case: find all remaining intel status.AllIntel = {} - for name, value in pairs(intelBlueprint) do - - -- may contain tables, such as `JamRadius` - if type(value) ~= 'table' then - if value == true or value > 0 then - local intel = BlueprintNameToIntel[name] - if intel and not activeIntel[intel] then - if allIntelIsFree then - status.AllIntelMaintenanceFree[intel] = true - else - status.AllIntel[intel] = true + if intelBlueprint then + for name, value in pairs(intelBlueprint) do + + -- may contain tables, such as `JamRadius` + if type(value) ~= 'table' then + if value == true or value > 0 then + local intel = BlueprintNameToIntel[name] + if intel and not activeIntel[intel] then + if allIntelIsFree then + status.AllIntelMaintenanceFree[intel] = true + else + status.AllIntel[intel] = true + end end end end From 12c347ab551d1b000009404f6e8092f29071f5f1 Mon Sep 17 00:00:00 2001 From: lL1l1 <82986251+lL1l1@users.noreply.github.com> Date: Tue, 1 Oct 2024 17:21:02 -0700 Subject: [PATCH 3/4] Revert "Post-process deployment" This reverts commit 71439fb5a9c8e898090fd3ca3431a418e0d6eb1e. --- lua/shared/components/DebugComponent.lua | 2 +- lua/version.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/shared/components/DebugComponent.lua b/lua/shared/components/DebugComponent.lua index f4d623c940..6ceb164723 100644 --- a/lua/shared/components/DebugComponent.lua +++ b/lua/shared/components/DebugComponent.lua @@ -35,7 +35,7 @@ DebugComponent = ClassSimple { EnabledLogging = true, EnabledWarnings = true, EnabledErrors = true, - EnabledDrawing = false, + EnabledDrawing = true, --#endregion } diff --git a/lua/version.lua b/lua/version.lua index 51ce54c7d9..6449b4ecee 100644 --- a/lua/version.lua +++ b/lua/version.lua @@ -28,9 +28,9 @@ -- - https://github.com/FAForever/fa/blob/develop/.github/workflows/deploy-fafbeta.yaml -- - https://github.com/FAForever/fa/blob/develop/.github/workflows/deploy-fafdevelop.yaml -local GameType = "FAF Develop" -- The use of `'` instead of `"` is **intentional** +local GameType = 'unknown' -- The use of `'` instead of `"` is **intentional** -local Commit = "c3fc75df99384898155603403f9eca80285657fb" -- The use of `'` instead of `"` is **intentional** +local Commit = 'unknown' -- The use of `'` instead of `"` is **intentional** --#endregion From 34f63ce76bea45612a3519d77b5c2966698ab794 Mon Sep 17 00:00:00 2001 From: lL1l1 <82986251+lL1l1@users.noreply.github.com> Date: Fri, 11 Oct 2024 22:28:39 -0700 Subject: [PATCH 4/4] Create fix.6467.md --- changelog/snippets/fix.6467.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/snippets/fix.6467.md diff --git a/changelog/snippets/fix.6467.md b/changelog/snippets/fix.6467.md new file mode 100644 index 0000000000..9a174e5f91 --- /dev/null +++ b/changelog/snippets/fix.6467.md @@ -0,0 +1 @@ +- (#6467) Fix a crash during blueprint loading if a unit blueprint has an enhancements table but not an intel table.