diff options
| author | BobTheBob <32057864+BobTheBob9@users.noreply.github.com> | 2021-12-05 23:28:38 +0000 |
|---|---|---|
| committer | BobTheBob <32057864+BobTheBob9@users.noreply.github.com> | 2021-12-05 23:28:38 +0000 |
| commit | f1a07e1b01923b45f7a82c063d25b8dea5b13d53 (patch) | |
| tree | 265a20be313fbdc054887c5be3d78797cbd6e707 /Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut | |
| parent | 51e16034230f4dd759900c7922b8db43941e0a70 (diff) | |
| download | NorthstarMods-f1a07e1b01923b45f7a82c063d25b8dea5b13d53.tar.gz NorthstarMods-f1a07e1b01923b45f7a82c063d25b8dea5b13d53.zip | |
fixes from playtest
Diffstat (limited to 'Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut')
| -rw-r--r-- | Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut index 4263eb1ac..e3b252f78 100644 --- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut +++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut @@ -314,7 +314,7 @@ void function GameStateEnter_WinnerDetermined_Threaded() if ( killcamsWereEnabled ) SetKillcamsEnabled( true ) } - else + else if ( IsRoundBased() || !ClassicMP_ShouldRunEpilogue() ) { // these numbers are temp and should really be based on consts of some kind foreach( entity player in GetPlayerArray() ) @@ -650,8 +650,11 @@ void function CleanUpEntitiesForRoundEnd() } foreach ( entity npc in GetNPCArray() ) - if ( IsAlive( npc ) ) - npc.Die() // need this because getnpcarray includes the pettitans we just killed at this point + if ( IsValid( npc ) ) + npc.Destroy() // need this because getnpcarray includes the pettitans we just killed at this point + + foreach ( entity weapon in GetEntArrayByClass_Expensive( "weaponx" ) ) + weapon.Destroy() // allow other scripts to clean stuff up too svGlobal.levelEnt.Signal( "CleanUpEntitiesForRoundEnd" ) |