From 0da60a2aab64cf83f08b38c1a6ab9b20d0283fa5 Mon Sep 17 00:00:00 2001
From: Dinorush <62536724+Dinorush@users.noreply.github.com>
Date: Wed, 26 Jan 2022 02:51:05 -0500
Subject: Fix to invalid earnObject id on titan death

---
 .../mod/scripts/vscripts/earn_meter/sv_earn_meter_mp.gnut           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Northstar.CustomServers/mod/scripts/vscripts/earn_meter/sv_earn_meter_mp.gnut b/Northstar.CustomServers/mod/scripts/vscripts/earn_meter/sv_earn_meter_mp.gnut
index 91f17a662..33e380d5f 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/earn_meter/sv_earn_meter_mp.gnut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/earn_meter/sv_earn_meter_mp.gnut
@@ -74,6 +74,8 @@ void function OnPlayerRespawned( entity player )
 void function EarnMeterMP_ReplaceReward( entity player, EarnObject reward, float rewardFrac )
 {
 	PlayerEarnMeter_Reset( player )
+	if ( reward.id < 0 )  // Don't set the reward if it is nonexistent
+		return
 	PlayerEarnMeter_SetReward( player, reward )
 	PlayerEarnMeter_SetRewardFrac( player, rewardFrac )
 
@@ -86,8 +88,8 @@ void function EarnMeterMP_PlayerLifeThink( entity player )
 	player.EndSignal( "OnDeath" )
 	player.EndSignal( "OnDestroy" )
 
-	EarnObject pilotReward
-	float pilotRewardFrac
+	EarnObject pilotReward = PlayerEarnMeter_GetReward( player ) 
+	float pilotRewardFrac = PlayerEarnMeter_GetRewardFrac( player )
 	int lastEarnMeterMode = PlayerEarnMeter_GetMode( player )
 	float lastPassiveGainTime = Time()
 
-- 
cgit v1.2.3