Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix dropship related crash #662

Merged
merged 14 commits into from
Jul 10, 2023
Merged

Fix dropship related crash #662

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
961a80d
Fix infinite loading screen
EnderBoy9217 Jun 17, 2023
a91a22c
Update Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
EnderBoy9217 Jun 17, 2023
a94610d
Update _menus.nut
EnderBoy9217 Jun 17, 2023
da65be2
Update _menus.nut
EnderBoy9217 Jun 17, 2023
3246c7d
Update _menus.nut
EnderBoy9217 Jun 17, 2023
4eed346
Merge branch 'main' into main
EnderBoy9217 Jul 6, 2023
9817a55
Add files via upload
EnderBoy9217 Jul 7, 2023
771707f
Update _menus.nut
EnderBoy9217 Jul 7, 2023
aba8d05
Update _menus.nut
EnderBoy9217 Jul 7, 2023
7c393c9
Update cplayer.nut
EnderBoy9217 Jul 7, 2023
7dd781d
Update cplayer.nut
EnderBoy9217 Jul 8, 2023
3504da3
Add files via upload
EnderBoy9217 Jul 8, 2023
c6354f2
Update _classic_mp_dropship_intro.gnut
EnderBoy9217 Jul 8, 2023
3e7de16
Merge branch 'main' into crashpatch1
EnderBoy9217 Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Northstar.CustomServers/mod/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -255,4 +256,4 @@ void function PlayerJumpsFromDropship( entity player )
WaitFrame()

TryGameModeAnnouncement( player )
}
}
Loading