Resets killstreak first before calculating kills.

1 files changed, 6 insertions, 3 deletions

diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut
index 119b1712..002b1331 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut
@@ -148,6 +148,11 @@ void function ScoreEvent_PlayerKilled( entity victim, entity attacker, var damag
 	if ( attacker.p.playerKillStreaks[ victim ] == DOMINATING_KILL_REQUIREMENT )
 		AddPlayerScore( attacker, "Dominating" )
 	
+	if ( Time() - attacker.s.lastKillTime > CASCADINGKILL_REQUIREMENT_TIME )
+	{
+		attacker.s.currentTimedKillstreak = 0 // reset first before kill
+		attacker.s.lastKillTime = Time()
+	}
 	
 	// timed killstreaks
 	if ( Time() - attacker.s.lastKillTime <= CASCADINGKILL_REQUIREMENT_TIME )
@@ -161,8 +166,6 @@ void function ScoreEvent_PlayerKilled( entity victim, entity attacker, var damag
 		else if ( attacker.s.currentTimedKillstreak == MEGAKILL_REQUIREMENT_KILLS )
 			AddPlayerScore( attacker, "MegaKill" )
 	}
-	else
-		attacker.s.currentTimedKillstreak = 0 // reset if a kill took too long
 	
 	attacker.s.lastKillTime = Time()
 }
@@ -231,4 +234,4 @@ void function ScoreEvent_SetupEarnMeterValuesForMixedModes() // mixed modes in t
 void function ScoreEvent_SetupEarnMeterValuesForTitanModes()
 {
 	// relatively sure we don't have to do anything here but leaving this function for consistency
-}
\ No newline at end of file
+}