diff options
| author | BobTheBob <32057864+BobTheBob9@users.noreply.github.com> | 2021-12-22 16:46:49 +0000 |
|---|---|---|
| committer | BobTheBob <32057864+BobTheBob9@users.noreply.github.com> | 2021-12-22 16:46:49 +0000 |
| commit | fb32cb1b780c1169a834c951bc0c928199a2b59e (patch) | |
| tree | e2435cc869fed0fa3f7c3d187335d2350b8b1e14 /Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_fastball_intro.gnut | |
| parent | dade102a0d4d14ba5ee560022b8e2f1ddf960977 (diff) | |
| download | NorthstarMods-fb32cb1b780c1169a834c951bc0c928199a2b59e.tar.gz NorthstarMods-fb32cb1b780c1169a834c951bc0c928199a2b59e.zip | |
playtest fixes
Diffstat (limited to 'Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_fastball_intro.gnut')
| -rw-r--r-- | Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_fastball_intro.gnut | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_fastball_intro.gnut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_fastball_intro.gnut index 860946938..b4e5ef2b3 100644 --- a/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_fastball_intro.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_fastball_intro.gnut @@ -118,26 +118,30 @@ void function AddPlayerToFastballIntro( entity player ) void function FastballPlayer( entity player ) { + player.EndSignal( "OnDestroy" ) + if ( IsAlive( player ) ) player.Die() // kill player if they're alive so there's no issues with that WaitFrame() player.EndSignal( "OnDeath" ) - player.EndSignal( "OnDestroy" ) // do this here so it's in OnThreadEnd var oldVisibility = player.kv.VisibilityFlags OnThreadEnd( function() : ( player, oldVisibility ) { - RemoveCinematicFlag( player, CE_FLAG_CLASSIC_MP_SPAWNING ) - player.ClearParent() - ClearPlayerAnimViewEntity( player ) - player.DeployWeapon() - player.PlayerCone_Disable() - player.ClearInvulnerable() - player.kv.VisibilityFlags = oldVisibility // restore visibility + if ( IsValid( player ) ) + { + RemoveCinematicFlag( player, CE_FLAG_CLASSIC_MP_SPAWNING ) + player.ClearParent() + ClearPlayerAnimViewEntity( player ) + player.DeployWeapon() + player.PlayerCone_Disable() + player.ClearInvulnerable() + player.kv.VisibilityFlags = oldVisibility // restore visibility + } }) FirstPersonSequenceStruct throwSequence |