Mapchange bug

This commit is contained in:
ChocoTaco 2019-03-28 16:27:59 -04:00
parent 49462d8e50
commit 79b7258f3a

View file

@ -231,8 +231,8 @@ function DMGame::resetScore(%game, %client)
%client.Bonus = 0; %client.Bonus = 0;
%client.KillStreakBonus = 0; %client.KillStreakBonus = 0;
%client.killCounter = 0;// not a score thing but needs to be reset // not a score thing but needs to be reset
%game.lastGuy = 0; %client.killCounter = 0;
} }
function DMGame::forceObserver( %game, %client, %reason ) function DMGame::forceObserver( %game, %client, %reason )
@ -251,10 +251,10 @@ function DMGame::onClientKilled(%game, %clVictim, %clKiller, %damageType, %imple
} }
function ProcessBonusDM(%game, %clVictim, %clKiller, %damageType, %implement, %damageLoc) function ProcessBonusDM(%game, %clVictim, %clKiller, %damageType, %implement, %damageLoc)
{ {
if(%clVictim.isMarked && $DMGame::mode) if(%clVictim.isMarked && $DMGame::mode)
{ {
if(%clKiller $= "") if(%clKiller $= "" || %clVictim.killCounter < 3)
return; return;
if(%clVictim == %clKiller || %clVictim.lastDeathSuicide) if(%clVictim == %clKiller || %clVictim.lastDeathSuicide)