From 1136d8a2c08545bbd624c7d521040cdb6782d586 Mon Sep 17 00:00:00 2001
From: McTwist <rajb89@hotmail.com>
Date: Wed, 24 Jan 2018 11:37:51 +0100
Subject: [PATCH] Added support for Event_onRelay Minor modifications

---
 server.cs | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/server.cs b/server.cs
index bfea6e5..4d8e482 100644
--- a/server.cs
+++ b/server.cs
@@ -1,9 +1,9 @@
 // ================
 // Name		::	FireRelayNum
-// Version	::	7
+// Version	::	8
 // ================
 // Made by	::	McTwist
-// Date		::	17-12-08
+// Date		::	18-01-24
 // Info		::	Event that choose what onRelay to use
 // License	::	Free to use
 // ================
@@ -66,21 +66,34 @@
 		if (%obj.eventInput[%i] !$= "onRelay")
 			continue;
 		
-		// Target another brick
+		// Target brick(s)
 		if (%obj.eventTargetIdx[%i] == -1)
 		{
 			%type = "fxDTSBrick";
 			%group = getBrickGroupFromObject(%obj);
 			%name = %obj.eventNT[%i];
-			for (%bricks = 0; %bricks < %group.NTObjectCount[%name]; %bricks++)
-				%bricks[%bricks] = %group.NTObject[%name, %bricks];
+			for (%objs = 0; %objs < %group.NTObjectCount[%name]; %objs++)
+				%objs[%objs] = %group.NTObject[%name, %objs];
 		}
 		// Self
 		else
 		{
 			%type = inputEvent_GetTargetClass(%obj.getClassName(), %obj.eventInputIdx[%i], %obj.eventTargetIdx[%i]);
-			%bricks = 1;
-			%bricks[0] = %obj;
+			%objs = 1;
+			// Get object from type (Event_onRelay)
+			switch$ (%type)
+			{
+			case "Bot":
+				%objs0 = %obj.hBot;
+			case "Player":
+				%objs0 = %client.player;
+			case "GameConnection":
+				%objs0 = %client;
+			case "Minigame":
+				%objs0 = getMinigameFromObject(%client);
+			default:
+				%objs0 = %obj;
+			}
 		}
 
 		// Parameters
@@ -96,9 +109,12 @@
 			%param = %param @ ", " @ %client;
 		
 		// Go through list/brick
-		for (%n = 0; %n < %bricks; %n++)
+		for (%n = 0; %n < %objs; %n++)
 		{
-			%next = %bricks[%n];
+			%next = %objs[%n];
+
+			if (!isObject(%next))
+				continue;
 			
 			// Call for event function
 			// Note: There is no other feasible way to do this on
@@ -111,6 +127,7 @@
 		// Mark as processed
 		%tempEvent[%i] = 1;
 	}
+	return "";
 }
 
 // Events