From dc361048aaac3b2f05fc95b3c8a2640100fd3e09 Mon Sep 17 00:00:00 2001
From: Angen <angen@wildfiregames.com>
Date: Sat, 6 Nov 2021 11:07:28 +0000
Subject: [PATCH] Fix a1010b83d3 and 8f8996e338

Fix wrong renaming done in a1010b83d3
Fix missed structure change in 453fe486de

Reported by: SciGuy42 on forum
https://wildfiregames.com/forum/topic/62269-onrange-triggers-in-a25/
Tested by: SciGuy42
Differential revision: D4335
This was SVN commit r25989.
---
 binaries/data/mods/public/simulation/components/Trigger.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/binaries/data/mods/public/simulation/components/Trigger.js b/binaries/data/mods/public/simulation/components/Trigger.js
index be05318245..d8c48cc491 100644
--- a/binaries/data/mods/public/simulation/components/Trigger.js
+++ b/binaries/data/mods/public/simulation/components/Trigger.js
@@ -192,7 +192,7 @@ Trigger.prototype.EnableTrigger = function(event, name)
 		}
 		const cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
 		triggerData.timer = cmpTimer.SetInterval(this.entity, IID_Trigger, "DoAction",
-			triggerData.delay || 0, triggerData.interval, { "name": name });
+			triggerData.delay || 0, triggerData.interval, { "action": name });
 	}
 	else if (event == "OnRange")
 	{
@@ -343,7 +343,7 @@ Trigger.prototype.CallEvent = function(event, eventData)
  */
 Trigger.prototype.CallTrigger = function(event, name, eventData, evenIfDisabled = true)
 {
-	if (!this?.[event]?.[name])
+	if (!this.triggers[event]?.[name])
 	{
 		warn(`Trigger.js: called a trigger '${name}' for event '${event}' that wasn't found`);
 		return;