From 3d66de5b03b8920f52f245df4187dd73d7d7e9c6 Mon Sep 17 00:00:00 2001
From: ChocoTaco <boldfilter@zoho.com>
Date: Fri, 22 Nov 2019 14:11:20 -0500
Subject: [PATCH] Added Back

Was able to fix without moving overrides
---
 Classic/scripts/LateOverridesGame.cs      | 90 -----------------------
 Classic/scripts/autoexec/GetTeamCounts.cs | 84 ++++++++++++++++++++-
 2 files changed, 82 insertions(+), 92 deletions(-)
 delete mode 100644 Classic/scripts/LateOverridesGame.cs

diff --git a/Classic/scripts/LateOverridesGame.cs b/Classic/scripts/LateOverridesGame.cs
deleted file mode 100644
index ebe6fde..0000000
--- a/Classic/scripts/LateOverridesGame.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// LateOveridesGame.cs
-//
-// Created to overrides that need to be executed later in the server loading process.
-// Sometimes this is necessary.
-//
-
-
-// autoexec/GetTeamCounts.cs Overrides
-// Proper Overrides
-// Events that determine a TeamGetCounts update
-package TeamCountsTriggers
-{
-
-function DefaultGame::clientJoinTeam( %game, %client, %team, %respawn )
-{
-	Parent::clientJoinTeam( %game, %client, %team, %respawn );
-
-	//Trigger GetCounts
-	ResetClientChangedTeams();
-}
-
-function DefaultGame::clientChangeTeam(%game, %client, %team, %fromObs, %respawned)
-{
-   Parent::clientChangeTeam(%game, %client, %team, %fromObs, %respawned);
-   
-   //Trigger GetCounts
-   ResetClientChangedTeams();
-}
-
-function DefaultGame::assignClientTeam(%game, %client, %respawn )
-{
-	Parent::assignClientTeam(%game, %client, %respawn );
-   
-	//Trigger GetCounts
-	ResetClientChangedTeams();
-}
-
-function DefaultGame::onClientEnterObserverMode( %game, %client )
-{
-	Parent::onClientEnterObserverMode( %game, %client );
-   
-	//Trigger GetCounts
-	ResetClientChangedTeams();
-}
-
-function DefaultGame::AIChangeTeam(%game, %client, %newTeam)
-{
-	Parent::AIChangeTeam(%game, %client, %newTeam);
-
-	//Trigger GetCounts
-	ResetClientChangedTeams();
-}
-
-function DefaultGame::forceObserver(%game, %client, %reason)
-{
-	Parent::forceObserver(%game, %client, %reason);
-   
-	//Trigger GetCounts
-	ResetClientChangedTeams();
-}
-
-function GameConnection::onConnect(%client, %name, %raceGender, %skin, %voice, %voicePitch)
-{
-	Parent::onConnect(%client, %name, %raceGender, %skin, %voice, %voicePitch);
-   
-	//Reset GetCounts
-	ResetClientChangedTeams();
-}
-
-function DefaultGame::gameOver(%game)
-{
-	Parent::gameOver(%game);
-	
-	//Reset GetCounts
-	ResetClientChangedTeams();
-}
-
-function GameConnection::onDrop(%client, %reason)
-{
-	Parent::onDrop(%client, %reason);
-	
-	//Reset GetCounts
-	ResetClientChangedTeams();
-}
-
-};
-
-// Prevent package from being activated if it is already
-if (!isActivePackage(TeamCountsTriggers))
-    activatePackage(TeamCountsTriggers);
diff --git a/Classic/scripts/autoexec/GetTeamCounts.cs b/Classic/scripts/autoexec/GetTeamCounts.cs
index 8537422..43bc918 100644
--- a/Classic/scripts/autoexec/GetTeamCounts.cs
+++ b/Classic/scripts/autoexec/GetTeamCounts.cs
@@ -21,6 +21,10 @@ function CreateServer( %mission, %missionType )
 	parent::CreateServer( %mission, %missionType );
 	//Call for a GetTeamCount update
 	GetTeamCounts( %game, %client, %respawn );
+	
+	// Prevent package from being activated if it is already
+	if (!isActivePackage(TeamCountsTriggers))
+		activatePackage(TeamCountsTriggers);
 }
 
 };
@@ -82,5 +86,81 @@ function ResetClientChangedTeams()
    $GetCountsClientTeamChange = true;
 }
 
-// Overrides moved to Scripts/LateOverridesGame.cs
-// Due to issues in reliability
\ No newline at end of file
+// Proper Overrides
+// Events that determine a TeamGetCounts update
+package TeamCountsTriggers
+{
+
+function DefaultGame::clientJoinTeam( %game, %client, %team, %respawn )
+{
+	Parent::clientJoinTeam( %game, %client, %team, %respawn );
+
+	//Trigger GetCounts
+	ResetClientChangedTeams();
+}
+
+function DefaultGame::clientChangeTeam(%game, %client, %team, %fromObs, %respawned)
+{
+   Parent::clientChangeTeam(%game, %client, %team, %fromObs, %respawned);
+   
+   //Trigger GetCounts
+   ResetClientChangedTeams();
+}
+
+function DefaultGame::assignClientTeam(%game, %client, %respawn )
+{
+	Parent::assignClientTeam(%game, %client, %respawn );
+   
+	//Trigger GetCounts
+	ResetClientChangedTeams();
+}
+
+function DefaultGame::onClientEnterObserverMode( %game, %client )
+{
+	Parent::onClientEnterObserverMode( %game, %client );
+   
+	//Trigger GetCounts
+	ResetClientChangedTeams();
+}
+
+function DefaultGame::AIChangeTeam(%game, %client, %newTeam)
+{
+	Parent::AIChangeTeam(%game, %client, %newTeam);
+
+	//Trigger GetCounts
+	ResetClientChangedTeams();
+}
+
+function DefaultGame::forceObserver(%game, %client, %reason)
+{
+	Parent::forceObserver(%game, %client, %reason);
+   
+	//Trigger GetCounts
+	ResetClientChangedTeams();
+}
+
+function GameConnection::onConnect(%client, %name, %raceGender, %skin, %voice, %voicePitch)
+{
+	Parent::onConnect(%client, %name, %raceGender, %skin, %voice, %voicePitch);
+   
+	//Reset GetCounts
+	ResetClientChangedTeams();
+}
+
+function DefaultGame::gameOver(%game)
+{
+	Parent::gameOver(%game);
+	
+	//Reset GetCounts
+	ResetClientChangedTeams();
+}
+
+function GameConnection::onDrop(%client, %reason)
+{
+	Parent::onDrop(%client, %reason);
+	
+	//Reset GetCounts
+	ResetClientChangedTeams();
+}
+
+};
\ No newline at end of file