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

Added Line 121

Browse source 
No observer bypass of respawn timer
This commit is contained in:
ChocoTaco1 2022-10-01 22:49:27 -04:00
parent 6a77d9a5d8
commit 8bcb0b64a2
1 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
Classic/scripts/camera.cs
View file

@ -118,39 +118,42 @@ function Observer::onTrigger(%data,%obj,%trigger,%state)
// Free-flying observer camera // Free-flying observer camera
if (%trigger == 0) if (%trigger == 0)
{ {
if( !$Host::TournamentMode && $MatchStarted ) if(!%client.waitRespawn && getSimTime() > %client.suicideRespawnTime)
{ {
// reset observer params if( !$Host::TournamentMode && $MatchStarted )
clearBottomPrint(%client); {
commandToClient(%client, 'setHudMode', 'Standard'); // reset observer params
clearBottomPrint(%client);
commandToClient(%client, 'setHudMode', 'Standard');
if( %client.lastTeam !$= "" && %client.lastTeam != 0 && Game.numTeams > 1) if( %client.lastTeam !$= "" && %client.lastTeam != 0 && Game.numTeams > 1)
{ {
Game.clientJoinTeam( %client, %client.lastTeam, $MatchStarted ); Game.clientJoinTeam( %client, %client.lastTeam, $MatchStarted );
%client.camera.setFlyMode(); %client.camera.setFlyMode();
%client.setControlObject( %client.player ); %client.setControlObject( %client.player );
}
else
{
Game.assignClientTeam( %client );
// Spawn the player:
Game.spawnPlayer( %client, true );
%client.camera.setFlyMode();
%client.setControlObject( %client.player );
ClearBottomPrint( %client );
}
} }
else else if( !$Host::TournamentMode )
{ {
clearBottomPrint(%client);
Game.assignClientTeam( %client ); Game.assignClientTeam( %client );
// Spawn the player: // Spawn the player:
Game.spawnPlayer( %client, true ); Game.spawnPlayer( %client, false );
%client.camera.setFlyMode(); %client.camera.getDataBlock().setMode( %client.camera, "pre-game", %client.player );
%client.setControlObject( %client.player ); %client.setControlObject( %client.camera );
ClearBottomPrint( %client );
} }
} }
else if( !$Host::TournamentMode )
{
clearBottomPrint(%client);
Game.assignClientTeam( %client );
// Spawn the player:
Game.spawnPlayer( %client, false );
%client.camera.getDataBlock().setMode( %client.camera, "pre-game", %client.player );
%client.setControlObject( %client.camera );
}
} }
else if (%trigger == 3) //press JET else if (%trigger == 3) //press JET
{ {