From a7e5ccc87866024f74ee7a132e3b3de4933677f3 Mon Sep 17 00:00:00 2001
From: ASpoonPlaysGames <66967891+ASpoonPlaysGames@users.noreply.github.com>
Date: Tue, 1 Mar 2022 18:22:21 +0000
Subject: added IsTitan() and IsPlayerDisembarking() checks for evac (#253)

* added IsTitan() and IsPlayerDisembarking() checks for evac

* Moved checks, and changed to use ContextAction_IsBusy()
---
 Northstar.CustomServers/mod/scripts/vscripts/evac/_evac.gnut | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Northstar.CustomServers/mod/scripts/vscripts/evac')

diff --git a/Northstar.CustomServers/mod/scripts/vscripts/evac/_evac.gnut b/Northstar.CustomServers/mod/scripts/vscripts/evac/_evac.gnut
index 454185c7..9fe95445 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/evac/_evac.gnut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/evac/_evac.gnut
@@ -260,7 +260,7 @@ void function Evac( int evacTeam, float initialWait, float arrivalTime, float wa
 	// have to do this inline since we capture the completionCallback
 	trigger.SetEnterCallback( void function( entity trigger, entity player ) : ( canBoardCallback, dropship ) 
 	{ 	
-		if ( !player.IsPlayer() || !IsAlive( player ) || player.IsTitan() || !canBoardCallback( dropship, player ) || PlayerInDropship( player, dropship ) )
+		if ( !player.IsPlayer() || !IsAlive( player ) || player.IsTitan() || player.ContextAction_IsBusy() || !canBoardCallback( dropship, player ) || PlayerInDropship( player, dropship ) )
 			return
 		
 		thread AddPlayerToEvacDropship( dropship, player )
-- 
cgit v1.2.3