From 7ccf0cd7bfb41d6ebcc40f145d47ee2312bdf006 Mon Sep 17 00:00:00 2001 From: elexis Date: Sat, 24 Mar 2018 15:08:34 +0000 Subject: [PATCH] Don't break the entire JS simulation if someone starts this map with treasures disabled. They are deleted before InitGame, resulting in the ownershipChange handler wanting to read from the entity ID arrays which weren't initialized yet. Reported By: mapkoc Refs https://wildfiregames.com/forum/index.php?/topic/24153-is-this-fixed/ This was SVN commit r21615. --- .../data/mods/public/maps/random/jebel_barkal_triggers.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/binaries/data/mods/public/maps/random/jebel_barkal_triggers.js b/binaries/data/mods/public/maps/random/jebel_barkal_triggers.js index 3a6b78da46..c00b097f8b 100644 --- a/binaries/data/mods/public/maps/random/jebel_barkal_triggers.js +++ b/binaries/data/mods/public/maps/random/jebel_barkal_triggers.js @@ -350,6 +350,8 @@ Trigger.prototype.debugLog = function(txt) Trigger.prototype.JebelBarkal_Init = function() { this.JebelBarkal_TrackUnits(); + this.RegisterTrigger("OnOwnershipChanged", "JebelBarkal_OwnershipChange", { "enabled": true }); + this.JebelBarkal_SetDefenderStance(); this.JebelBarkal_StartRitualAnimations(); this.JebelBarkal_GarrisonBuildings(); @@ -600,7 +602,5 @@ Trigger.prototype.JebelBarkal_OwnershipChange = function(data) { - let cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger); - cmpTrigger.RegisterTrigger("OnInitGame", "JebelBarkal_Init", { "enabled": true }); - cmpTrigger.RegisterTrigger("OnOwnershipChanged", "JebelBarkal_OwnershipChange", { "enabled": true }); + Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger).RegisterTrigger("OnInitGame", "JebelBarkal_Init", { "enabled": true }); }