From d9c60a40237a2bd0e69a1344c57b94823718a518 Mon Sep 17 00:00:00 2001
From: Max <reachbailmast@gmail.com>
Date: Fri, 14 Mar 2025 04:26:32 +0300
Subject: [PATCH 1/2] PlayerCanJoinTeam called as a hooks intead of a function

---
 garrysmod/gamemodes/base/gamemode/player.lua | 22 +++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/garrysmod/gamemodes/base/gamemode/player.lua b/garrysmod/gamemodes/base/gamemode/player.lua
index 3e59cb1b0b..c6456e81b2 100644
--- a/garrysmod/gamemodes/base/gamemode/player.lua
+++ b/garrysmod/gamemodes/base/gamemode/player.lua
@@ -623,18 +623,16 @@ end
 -----------------------------------------------------------]]
 function GM:PlayerRequestTeam( ply, teamid )
 
-	-- No changing teams if not teambased!
 	if ( !GAMEMODE.TeamBased ) then return end
 
-	-- This team isn't joinable
 	if ( !team.Joinable( teamid ) ) then
 		ply:ChatPrint( "You can't join that team" )
-	return end
+		return
+	end
 
-	-- This team isn't joinable
-	if ( !GAMEMODE:PlayerCanJoinTeam( ply, teamid ) ) then
-		-- Messages here should be outputted by this function
-	return end
+	if ( !hook.Call('PlayerCanJoinTeam', self, ply, teamid) ) then
+		return
+	end
 
 	GAMEMODE:PlayerJoinTeam( ply, teamid )
 
@@ -820,7 +818,15 @@ end
 function GM:PlayerButtonDown( ply, btn ) end
 function GM:PlayerButtonUp( ply, btn ) end
 
-concommand.Add( "changeteam", function( pl, cmd, args ) hook.Call( "PlayerRequestTeam", GAMEMODE, pl, tonumber( args[ 1 ] ) ) end )
+concommand.Add( "changeteam", function( pl, cmd, args )
+	local teamid = tonumber( args[ 1 ] )
+
+	if ( teamid == nil ) then
+		return
+	end
+
+	hook.Call( "PlayerRequestTeam", GAMEMODE, pl, teamid )
+end )
 
 --[[---------------------------------------------------------
 	Name: gamemode:HandlePlayerArmorReduction()

From ce6c885558c80e8221a66024e172a4c60aa5022c Mon Sep 17 00:00:00 2001
From: Max <reachbailmast@gmail.com>
Date: Fri, 14 Mar 2025 04:37:21 +0300
Subject: [PATCH 2/2] change quoutes

---
 garrysmod/gamemodes/base/gamemode/player.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/garrysmod/gamemodes/base/gamemode/player.lua b/garrysmod/gamemodes/base/gamemode/player.lua
index c6456e81b2..358990bc53 100644
--- a/garrysmod/gamemodes/base/gamemode/player.lua
+++ b/garrysmod/gamemodes/base/gamemode/player.lua
@@ -630,7 +630,7 @@ function GM:PlayerRequestTeam( ply, teamid )
 		return
 	end
 
-	if ( !hook.Call('PlayerCanJoinTeam', self, ply, teamid) ) then
+	if ( !hook.Call( "PlayerCanJoinTeam", self, ply, teamid ) ) then
 		return
 	end