No return interfering with any overrides
This commit is contained in:
ChocoTaco1 2020-09-03 18:45:29 -04:00
parent 372f311b70
commit dbb1db525e

View file

@ -47,18 +47,18 @@ function DefaultGame::onClientKilled(%game, %clVictim, %clKiller, %damageType, %
if($BigTeam !$= "" && %clVictim.team == $BigTeam) if($BigTeam !$= "" && %clVictim.team == $BigTeam)
{ {
//If someone switches to observer or disconnects
if(%damageType $= 0)
return;
%otherteam = $BigTeam == 1 ? 2 : 1; %otherteam = $BigTeam == 1 ? 2 : 1;
if($TeamRank[$BigTeam, count] - $TeamRank[%otherteam, count] >= 2) if($TeamRank[$BigTeam, count] - $TeamRank[%otherteam, count] >= 2)
{ {
echo(%clVictim.nameBase @ " has been moved to Team " @ %otherTeam @ " for balancing."); //If someone switches to observer or disconnects
messageClient(%clVictim, 'MsgTeamBalanceNotify', '\c0You were switched to Team %1 for balancing.~wfx/powered/vehicle_screen_on.wav', $TeamName[%otherteam]); if(%damageType !$= 0)
messageAllExcept(%clVictim, -1, 'MsgTeamBalanceNotify', '~wfx/powered/vehicle_screen_on.wav'); {
echo(%clVictim.nameBase @ " has been moved to Team " @ %otherTeam @ " for balancing.");
Game.clientChangeTeam( %clVictim, %otherTeam, 0 ); messageClient(%clVictim, 'MsgTeamBalanceNotify', '\c0You were switched to Team %1 for balancing.~wfx/powered/vehicle_screen_on.wav', $TeamName[%otherteam]);
messageAllExcept(%clVictim, -1, 'MsgTeamBalanceNotify', '~wfx/powered/vehicle_screen_on.wav');
Game.clientChangeTeam( %clVictim, %otherTeam, 0 );
}
} }
else else
{ {