PlayerCanJoinTeam called as a hooks intead of a function

Author: Max

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()