Update Traitodoors

TroubleInTerroristTown · Mar 21, 2018 · 4790fdf · 4790fdf
1 parent 0e6372c
commit 4790fdf
Showing 1 changed file with 10 additions and 32 deletions.
diff --git a/addons/sourcemod/scripting/ttt/ttt_traitordoors.sp b/addons/sourcemod/scripting/ttt/ttt_traitordoors.sp
@@ -3,9 +3,6 @@
 
 #include <sourcemod>
 #include <sdktools>
-#include <sdkhooks>
-#include <cstrike>
-#include <multicolors>
 #include <ttt>
 
 #define PLUGIN_NAME TTT_PLUGIN_NAME ... " - Traitor Doors"
@@ -22,46 +19,22 @@ public Plugin myinfo =
 public void OnPluginStart()
 {
 	CreateConVar("ttt2_traitor_door_version", TTT_PLUGIN_VERSION, TTT_PLUGIN_DESCRIPTION, FCVAR_NOTIFY | FCVAR_DONTRECORD | FCVAR_REPLICATED);
-
-	HookEvent("round_start", Event_OnRoundStart);
 }
 
-public void OnMapStart()
-{
-	SetupDoors();
-}
 
-public Action Event_OnRoundStart(Handle event, const char[] name, bool dontBroadcast)
+public void TTT_OnRoundStart(int innocents, int traitors, int detective)
 {
-	SetupDoors();
-
-	return Plugin_Continue;
-}
-
-Handle g_aDoors = null;
-
-stock void SetupDoors()
-{
-	if (g_aDoors == null)
-	{
-		g_aDoors = CreateArray(1);
-	}
-	else
-	{
-		ClearArray(g_aDoors);
-	}
-
-	int maxent = GetMaxEntities();
 	char sClass[64];
 	char sName[64];
-	for (int i = MaxClients; i < maxent; i++)
+
+	for (int i = MaxClients; i < GetMaxEntities(); i++)
 	{
 		if (IsValidEdict(i) && IsValidEntity(i))
 		{
 			GetEdictClassname(i, sClass, sizeof(sClass));
 			GetEntPropString(i, Prop_Data, "m_iName", sName, sizeof(sName));
 
-			if (StrContains(sClass, "_door", false) != -1 && StrContains(sName, "traitor", false) != -1)
+			if ((StrContains(sClass, "_door", false) != -1 || StrContains(sClass, "_room", false) != -1) && StrContains(sName, "traitor", false) != -1)
 			{
 				AcceptEntityInput(i, "Lock");
 
@@ -73,6 +46,11 @@ stock void SetupDoors()
 
 public Action OnPlayerRunCmd(int client, int &buttons, int &impulse, float vel[3], float angles[3], int &weapon, int &subtype, int &cmdnum, int &tickcount, int &seed, int mouse[2])
 {
+	if (!TTT_IsClientValid(client))
+	{
+		return Plugin_Continue;
+	}
+
 	if (!IsPlayerAlive(client))
 	{
 		return Plugin_Continue;
@@ -100,7 +78,7 @@ public Action OnPlayerRunCmd(int client, int &buttons, int &impulse, float vel[3
 	GetEdictClassname(target, sClass, sizeof(sClass));
 	GetEntPropString(target, Prop_Data, "m_iName", sName, sizeof(sName));
 
-	if (StrContains(sClass, "_door", false) != -1 && StrContains(sName, "traitor", false) != -1)
+	if ((StrContains(sClass, "_door", false) != -1 || StrContains(sClass, "_room", false) != -1) && StrContains(sName, "traitor", false) != -1)
 	{
 		AcceptEntityInput(target, "Unlock");
 		AcceptEntityInput(target, "Open");