From 41f104e5f40654948dccfefd169152d47064c6ae Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Mon, 10 Jul 2023 10:12:23 -0400
Subject: Fix dropship related crash (#662)

* Fix infinite loading screen

* Update Northstar.Client/mod/scripts/vscripts/ui/_menus.nut

* Update _menus.nut

* Update _menus.nut

* Update _menus.nut

* Add files via upload

* Update _menus.nut

* Update _menus.nut

* Update cplayer.nut

* Update cplayer.nut

* Add files via upload

* Update _classic_mp_dropship_intro.gnut
---
 .../mod/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Northstar.CustomServers/mod')

diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut b/Northstar.CustomServers/mod/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut
index 0555df9b..23ae37a1 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut
@@ -188,7 +188,8 @@ void function SpawnPlayerIntoDropship( entity player )
 	}
 	
 	// respawn player and holster their weapons so they aren't out
-	player.RespawnPlayer( null )
+	if ( !IsAlive( player ) )
+		player.RespawnPlayer( null )
 	HolsterAndDisableWeapons(player)
 	player.DisableWeaponViewModel()
 	
@@ -255,4 +256,4 @@ void function PlayerJumpsFromDropship( entity player )
 		WaitFrame()
 	
 	TryGameModeAnnouncement( player )
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3