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

Merge branch 'Dev' into Stable

Browse source
This commit is contained in:
ChocoTaco1 2026-01-05 15:57:12 -05:00
parent bddef9489c 74ed8c8cde
commit 60a84fdb35
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Classic/scripts/autoexec/TeamManagement.cs
View file

@ -42,7 +42,7 @@ function GetTeamCounts(%game)
if($countdownStarted && $MatchStarted) if($countdownStarted && $MatchStarted)
{ {
//Variables //Variables
$TotalTeamPlayerCount = $TeamRank[1, count] + $TeamRank[2, count]; $TotalTeamPlayerCount = (Game.class $= "LakRabbitGame") ? $TeamRank[0, count] : ($TeamRank[1, count] + $TeamRank[2, count]);
$AllPlayerCount = $HostGamePlayerCount; $AllPlayerCount = $HostGamePlayerCount;
//Observers //Observers

2
Classic/scripts/inventory.cs
View file

@ -445,7 +445,7 @@ function ShapeBase::throwObject(%this,%obj)
{ {
%obj.static = false; %obj.static = false;
// z0dd - ZOD - SquirrelOfDeath, 10/02/02. Hack for flag collision bug. // z0dd - ZOD - SquirrelOfDeath, 10/02/02. Hack for flag collision bug.
if(Game.Class $= CTFGame || Game.Class $= PracticeCTFGame || Game.Class $= SCtFGame) if(Game.Class $= CTFGame || Game.Class $= PracticeCTFGame || Game.Class $= SCtFGame || Game.Class $= LCTFGame)
%obj.searchSchedule = Game.schedule(10, "startFlagCollisionSearch", %obj); %obj.searchSchedule = Game.schedule(10, "startFlagCollisionSearch", %obj);
} }
//------------------------------------------------------------------ //------------------------------------------------------------------