From 2b36b0e923069904980639a04634cab923487a3b Mon Sep 17 00:00:00 2001
From: BobTheBob <32057864+BobTheBob9@users.noreply.github.com>
Date: Tue, 28 Dec 2021 03:26:44 +0000
Subject: fix hide and seek noises being too common and some general
 disconnection checks

---
 Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_hs.gnut     | 4 ++--
 .../mod/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut           | 3 +++
 Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut     | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_hs.gnut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_hs.gnut
index ed2451528..4fb45a740 100644
--- a/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_hs.gnut
+++ b/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_hs.gnut
@@ -184,8 +184,8 @@ void function PlayHintSoundsForHider( entity player )
 	
 	while ( true )
 	{
-		wait 1.0
-		EmitSoundOnEntity( player, "weapon_chargerifle_fire_3p" )
+		wait 60.0
+		EmitSoundOnEntityToTeamExceptPlayer( player, "weapon_chargerifle_fire_3p", HIDEANDSEEK_TEAM_SEEKER, null )
 	}
 }
 
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut b/Northstar.CustomServers/mod/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut
index 7ca1246b1..4f6a12914 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut
@@ -203,6 +203,9 @@ void function SpawnPlayerIntoDropship( entity player )
 
 void function PlayerJumpsFromDropship( entity player )
 {
+	player.EndSignal( "OnDeath" )
+	player.EndSignal( "OnDestroy" )
+
 	OnThreadEnd( function() : ( player )
 	{
 		if ( IsValid( player ) )
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut
index 6518b6336..2f16379e2 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut
@@ -451,6 +451,7 @@ void function GameStateEnter_SwitchingSides_Threaded()
 
 void function PlayerWatchesSwitchingSidesKillReplay( entity player, bool doReplay, float replayLength )
 {
+	player.EndSignal( "OnDestroy" )
 	player.FreezeControlsOnServer()
 
 	ScreenFadeToBlackForever( player, SWITCHING_SIDES_DELAY_REPLAY ) // automatically cleared 
-- 
cgit v1.2.3