Tribes2/TacoServer
1
0
Fork 0
mirror of https://github.com/ChocoTaco1/TacoServer.git synced 2026-01-19 16:14:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Always obs

Browse source
This commit is contained in:
ChocoTaco1 2022-05-08 13:53:25 -04:00
parent 35811e33f8
commit d9ee54045b
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Classic/scripts/autoexec/VoteMenu.cs
View file

@ -1532,32 +1532,36 @@ function serverCmdClientJoinGame(%client)
{ {
if($LockedTeams) if($LockedTeams)
{ {
messageClient( %client, '', "Teams are locked. Ask an admin to set your team." ); messageClient( %client, '', "Teams are locked. Wait to be assigned a team." );
return; return;
} }
Parent::serverCmdClientJoinGame(%client); Parent::serverCmdClientJoinGame(%client);
} }
//exec("Scripts/autoexec/votemenu.cs");
function serverCmdClientPickedTeam(%client, %option) function serverCmdClientPickedTeam(%client, %option)
{ {
Parent::serverCmdClientPickedTeam(%client, %option); //Put first if(!$Host::TournamentMode)
if($LockedTeams) //Added return;
{
if($Host::TournamentMode && %client.team !$= 0) //Added //All roads lead to observer
{ if( isObject(%client.player) )
messageClient( %client, '', "Teams are locked. Ask an admin to set your team." ); {
schedule(1000, 0, "ClearCenterPrint", %client); //So Press FIRE when ready is cleared, later down the pipe %client.player.scriptKill(0);
serverCmdClientMakeObserver( %client ); ClearBottomPrint(%client);
} }
return; Game.forceObserver( %client, "playerChoose" );
} %client.observerMode = "observer";
%client.notReady = false;
messageClient( %client, '', "Teams are locked. Wait to be assigned a team." );
return;
} }
function serverCmdClientTeamChange(%client, %option) function serverCmdClientTeamChange(%client, %option)
{ {
if($LockedTeams) if($LockedTeams)
{ {
messageClient( %client, '', "Teams are locked. Ask an admin to set your team." ); messageClient( %client, '', "Teams are locked. Wait to be assigned a team." );
return; return;
} }
Parent::serverCmdClientTeamChange(%client, %option); Parent::serverCmdClientTeamChange(%client, %option);
@ -1613,4 +1617,4 @@ function VoteSound(%teamSpecific, %typename, %arg1, %arg2, %msg)
echo(%vip SPC %msg); echo(%vip SPC %msg);
} }
} }
} }