From 34e5b52282a7d3619e032a928d16058cc7044678 Mon Sep 17 00:00:00 2001
From: LightBlueCube <115393812+LightBlueCube@users.noreply.github.com>
Date: Tue, 3 Sep 2024 07:49:15 +0800
Subject: Prevent rare crash when player disconnects during War Games intro
 (#856)

---
 .../mod/scripts/vscripts/mp/levels/mp_wargames.nut                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Northstar.CustomServers')

diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_wargames.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_wargames.nut
index 8d859ba6..376c5b7c 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_wargames.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_wargames.nut
@@ -231,6 +231,8 @@ void function OnPrematchStart()
 
 void function PlayerWatchesWargamesIntro( entity player )
 {
+	player.EndSignal( "OnDestroy" )
+	
 	if ( IsAlive( player ) )
 		player.Die()
 
@@ -253,8 +255,6 @@ void function PlayerWatchesWargamesIntro( entity player )
 	
 	// we need to wait a frame if we killed ourselves to spawn into this, so just easier to do it all the time to remove any weirdness
 	WaitFrame()
-	
-	player.EndSignal( "OnDestroy" )
 	player.EndSignal( "OnDeath" )
 	
 	int factionTeam = ConvertPlayerFactionToIMCOrMilitiaTeam( player )
-- 
cgit v1.2.3