From e0481b283b92e77e4e081789083a3a972c63b1cf Mon Sep 17 00:00:00 2001 From: phosit Date: Thu, 23 Oct 2025 18:22:27 +0200 Subject: [PATCH] Only make existing Civilians invulnerable On "Survival of the Fittest" the treasure-collector are made invulnerable. Thous Civilian might not exist when the player is removed. Fixes: #8421 --- .../public/maps/random/survivalofthefittest_triggers.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js b/binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js index 55f87e8f08..b21b2c2739 100644 --- a/binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js +++ b/binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js @@ -149,7 +149,11 @@ Trigger.prototype.InitStartingUnits = function() { this.playerCivicCenter[playerID] = TriggerHelper.GetPlayerEntitiesByClass(playerID, "CivilCentre")[0]; this.treasureCivilian[playerID] = TriggerHelper.GetPlayerEntitiesByClass(playerID, "Civilian")[0]; - Engine.QueryInterface(this.treasureCivilian[playerID], IID_Resistance).SetInvulnerability(true); + if (this.treasureCivilian[playerID]) + { + Engine.QueryInterface(this.treasureCivilian[playerID], IID_Resistance) + .SetInvulnerability(true); + } } };