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

onKilled OOB damage cancel

Browse source
This commit is contained in:
ChocoTaco 2021-08-18 16:00:30 -04:00
parent e13310b8e4
commit 224c5b2d1e
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Classic/scripts/LakRabbitGame.cs
View file

@ -1668,6 +1668,9 @@ function LakRabbitGame::onClientDamaged(%game, %clVictim, %clAttacker, %damageTy
function LakRabbitGame::onClientKilled(%game, %clVictim, %clKiller, %damageType, %implement, %damageLoc) function LakRabbitGame::onClientKilled(%game, %clVictim, %clKiller, %damageType, %implement, %damageLoc)
{ {
//Make sure OOB damage is cancelled
cancel(%clVictim.player.alertThread);
// borlak - make sure victim isn't killer // borlak - make sure victim isn't killer
if(%clKiller != %clVictim) if(%clKiller != %clVictim)
{ {
@ -1682,6 +1685,7 @@ function LakRabbitGame::onClientKilled(%game, %clVictim, %clKiller, %damageType,
if(Game.duelMode && %killer.player.holdingFlag && %damageType != $DamageType::Missile) if(Game.duelMode && %killer.player.holdingFlag && %damageType != $DamageType::Missile)
duelBonus(%killer); duelBonus(%killer);
} }
// borlak -- flag bug fix // borlak -- flag bug fix
%clVictim.flagDeny = schedule(2500, 0, setFlagDeny, %clVictim, 0); %clVictim.flagDeny = schedule(2500, 0, setFlagDeny, %clVictim, 0);