wip on removing gokz gamemode features

1 files changed, 6 insertions, 3 deletions

diff --git a/source/sourcemod/scripting/gokz-core/misc.sp b/source/sourcemod/scripting/gokz-core/misc.sp
index a117880..ae44a1d 100644
--- a/source/sourcemod/scripting/gokz-core/misc.sp
+++ b/source/sourcemod/scripting/gokz-core/misc.sp
@@ -208,7 +208,7 @@ void OnPlayerRunCmd_Turnbinds(int client, int buttons, int tickcount, float angl
 void OnPlayerSpawn_PlayerCollision(int client)
 {
 	// Let players go through other players
-	SetEntProp(client, Prop_Send, "m_CollisionGroup", GOKZ_COLLISION_GROUP_STANDARD);
+	// SetEntProp(client, Prop_Send, "m_CollisionGroup", GOKZ_COLLISION_GROUP_STANDARD);
 }
 
 void OnSetModel_PlayerCollision(int client)
@@ -230,7 +230,7 @@ void OnSetModel_PlayerCollision(int client)
 
 void OnRoundStart_ForceAllTalk()
 {
-	gCV_sv_full_alltalk.BoolValue = true;
+	// gCV_sv_full_alltalk.BoolValue = true;
 }
 
 
@@ -350,7 +350,10 @@ void JoinTeam(int client, int newTeam, bool restorePos, bool forceBroadcast = fa
 			// Need to teleport the player to a valid one.
 			float spawnOrigin[3];
 			float spawnAngles[3];
-			GetValidSpawn(spawnOrigin, spawnAngles);
+      if (newTeam == CS_TEAM_CT)
+        GetValidSpawnCT(spawnOrigin, spawnAngles);
+      else
+        GetValidSpawnT(spawnOrigin, spawnAngles);
 			TeleportPlayer(client, spawnOrigin, spawnAngles);
 		}
 		hasSavedPosition[client] = false;