diff --git a/QSB/Inputs/QSBInputManager.cs b/QSB/Inputs/QSBInputManager.cs index 840ffeb0..dcf06a1b 100644 --- a/QSB/Inputs/QSBInputManager.cs +++ b/QSB/Inputs/QSBInputManager.cs @@ -58,7 +58,6 @@ namespace QSB.Inputs public void SetInputsEnabled(bool enabled) { - DebugLog.DebugWrite($"INPUTS ENABLED? : {enabled}"); InputsEnabled = enabled; } } diff --git a/QSB/Player/Events/PlayerJoinEvent.cs b/QSB/Player/Events/PlayerJoinEvent.cs index 56d68060..d0177a15 100644 --- a/QSB/Player/Events/PlayerJoinEvent.cs +++ b/QSB/Player/Events/PlayerJoinEvent.cs @@ -80,7 +80,6 @@ namespace QSB.Player.Events if (QSBSceneManager.IsInUniverse) { - DebugLog.DebugWrite($"Joined! SENDING READY = TRUE"); QSBPlayerManager.LocalPlayer.IsReady = true; QSBEventManager.FireEvent(EventNames.QSBPlayerReady, true); } diff --git a/QSB/Player/PlayerHUDMarker.cs b/QSB/Player/PlayerHUDMarker.cs index 30f4d5a1..0e411f5f 100644 --- a/QSB/Player/PlayerHUDMarker.cs +++ b/QSB/Player/PlayerHUDMarker.cs @@ -21,7 +21,6 @@ namespace QSB.Player public void Init(PlayerInfo player) { - DebugLog.DebugWrite($"Init {player.PlayerId} name:{player.Name}"); _player = player; _player.HudMarker = this; _needsInitializing = true; diff --git a/QSB/Player/QSBPlayerManager.cs b/QSB/Player/QSBPlayerManager.cs index 927804f8..6895a1da 100644 --- a/QSB/Player/QSBPlayerManager.cs +++ b/QSB/Player/QSBPlayerManager.cs @@ -91,7 +91,6 @@ namespace QSB.Player player.ProbeActive = message.ProbeActive; if (LocalPlayer.IsReady && player.IsReady) { - DebugLog.DebugWrite($"{player.PlayerId} UpdateObjectsFromStates player.IsReady:{player.IsReady}, camerabody null :{player.CameraBody == null}"); player.UpdateObjectsFromStates(); } diff --git a/QSB/Player/TransformSync/PlayerTransformSync.cs b/QSB/Player/TransformSync/PlayerTransformSync.cs index 6f670f44..8c90ead7 100644 --- a/QSB/Player/TransformSync/PlayerTransformSync.cs +++ b/QSB/Player/TransformSync/PlayerTransformSync.cs @@ -62,14 +62,12 @@ namespace QSB.Player.TransformSync if (isInUniverse && !_isInitialized) { - DebugLog.DebugWrite($"Is in universe, but is not initialized! SENDING READY = FALSE"); Player.IsReady = false; QSBEventManager.FireEvent(EventNames.QSBPlayerReady, false); } if (!isInUniverse) { - DebugLog.DebugWrite($"Is not in universe! SENDING READY = FALSE"); Player.IsReady = false; QSBEventManager.FireEvent(EventNames.QSBPlayerReady, false); } @@ -81,8 +79,6 @@ namespace QSB.Player.TransformSync { base.Init(); - DebugLog.DebugWrite($"Init! SENDING READY = TRUE"); - Player.IsReady = true; QSBEventManager.FireEvent(EventNames.QSBPlayerReady, true); } diff --git a/QSB/StatueSync/Events/StartStatueEvent.cs b/QSB/StatueSync/Events/StartStatueEvent.cs index f9e95ecc..c0df8d01 100644 --- a/QSB/StatueSync/Events/StartStatueEvent.cs +++ b/QSB/StatueSync/Events/StartStatueEvent.cs @@ -28,8 +28,6 @@ namespace QSB.StatueSync.Events public override void OnReceiveLocal(bool server, StartStatueMessage message) { - DebugLog.DebugWrite($"OnReceiveLocal StartStatueEvent"); - if (!QSBCore.IsHost) { return; @@ -40,8 +38,14 @@ namespace QSB.StatueSync.Events public override void OnReceiveRemote(bool server, StartStatueMessage message) { - DebugLog.DebugWrite($"OnReceiveRemote StartStatueEvent"); StatueManager.Instance.BeginSequence(message.PlayerPosition, message.PlayerRotation, message.CameraDegrees); + + if (!QSBCore.IsHost) + { + return; + } + + QSBEventManager.FireEvent(EventNames.QSBServerState, ServerState.InStatueCutscene); } } } diff --git a/QSB/TimeSync/WakeUpSync.cs b/QSB/TimeSync/WakeUpSync.cs index db66dc42..bac9d9d9 100644 --- a/QSB/TimeSync/WakeUpSync.cs +++ b/QSB/TimeSync/WakeUpSync.cs @@ -278,7 +278,6 @@ namespace QSB.TimeSync { if (CurrentState != State.Pausing) { - DebugLog.DebugWrite($"Wait for other clients to be ready"); StartPausing(PauseReason.WaitingForAllPlayersToBeReady); } } @@ -287,7 +286,6 @@ namespace QSB.TimeSync { if (clientState == ClientState.AliveInSolarSystem && serverState == ServerState.InSolarSystem) { - DebugLog.DebugWrite($"start of new loop!"); ResetTimeScale(); } } @@ -352,13 +350,11 @@ namespace QSB.TimeSync if (serverState == ServerState.NotLoaded && CurrentState != State.Pausing && QSBSceneManager.IsInUniverse) { - DebugLog.DebugWrite($"Server Not Loaded"); StartPausing(PauseReason.ServerNotStarted); } if (serverState == ServerState.WaitingForAllPlayersToReady && CurrentState != State.Pausing && clientState == ClientState.WaitingForOthersToReadyInSolarSystem) { - DebugLog.DebugWrite($"Awaiting Play Confirmation"); StartPausing(PauseReason.WaitingForAllPlayersToBeReady); } @@ -369,7 +365,6 @@ namespace QSB.TimeSync if (serverState == ServerState.WaitingForAllPlayersToDie && clientState == ClientState.WaitingForOthersToReadyInSolarSystem) { - DebugLog.DebugWrite($"Wait for others to load new scene"); StartPausing(PauseReason.WaitingForAllPlayersToBeReady); } @@ -379,7 +374,6 @@ namespace QSB.TimeSync { if (serverState != ServerState.NotLoaded) { - DebugLog.DebugWrite($"Server started!"); ResetTimeScale(); } } @@ -388,7 +382,6 @@ namespace QSB.TimeSync { if (clientState == ClientState.AliveInSolarSystem && serverState == ServerState.InSolarSystem) { - DebugLog.DebugWrite($"start of new loop!"); ResetTimeScale(); } } @@ -397,7 +390,6 @@ namespace QSB.TimeSync { if (Time.timeSinceLevelLoad <= _serverTime) { - DebugLog.DebugWrite($"Done pausing to match time!"); ResetTimeScale(); } } @@ -406,7 +398,6 @@ namespace QSB.TimeSync { if (Time.timeSinceLevelLoad >= _serverTime) { - DebugLog.DebugWrite($"Done fast-forwarding to match time!"); ResetTimeScale(); } }