diff options
| author | ASpoonPlaysGames <66967891+ASpoonPlaysGames@users.noreply.github.com> | 2022-03-01 18:22:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-01 18:22:21 +0000 |
| commit | a7e5ccc87866024f74ee7a132e3b3de4933677f3 (patch) | |
| tree | 5071f37f297259c8aae8baa3540c07b44558c6e9 /Northstar.CustomServers | |
| parent | 0e9445b79ac04ae8ef2265c434d4fa76ae3dab96 (diff) | |
| download | NorthstarMods-a7e5ccc87866024f74ee7a132e3b3de4933677f3.tar.gz NorthstarMods-a7e5ccc87866024f74ee7a132e3b3de4933677f3.zip | |
added IsTitan() and IsPlayerDisembarking() checks for evac (#253)
* added IsTitan() and IsPlayerDisembarking() checks for evac
* Moved checks, and changed to use ContextAction_IsBusy()
Diffstat (limited to 'Northstar.CustomServers')
| -rw-r--r-- | Northstar.CustomServers/mod/scripts/vscripts/evac/_evac.gnut | 2 |
1 files changed, 1 insertions, 1 deletions
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 ) |