From b8067adbeba193bad8cef1149c3e6a4db6d59c79 Mon Sep 17 00:00:00 2001 From: Mister_Nebula <41904486+misternebula@users.noreply.github.com> Date: Mon, 10 Aug 2020 12:16:07 +0100 Subject: [PATCH] cleanup --- QSB/Animation/AnimationSync.cs | 1 - QSB/Events/PlayerLeaveEvent.cs | 1 - QSB/Events/PlayerProbeLauncherEvent.cs | 2 +- QSB/Events/PlayerReadyEvent.cs | 4 ---- QSB/Events/PlayerState.cs | 1 - QSB/Events/PlayerSuitEvent.cs | 1 - QSB/Events/PlayerTranslatorEvent.cs | 2 +- QSB/Events/ServerTimeEvent.cs | 4 ---- QSB/Messaging/MessageType.cs | 4 +--- QSB/Messaging/ServerTimeMessage.cs | 3 +-- QSB/PlayerInfo.cs | 3 +-- QSB/PlayerRegistry.cs | 2 -- QSB/TimeSync/WakeUpSync.cs | 2 -- QSB/Tools/PlayerToolsManager.cs | 2 -- QSB/TransformSync/PlayerCameraSync.cs | 1 - QSB/TransformSync/PlayerTransformSync.cs | 1 - QSB/TransformSync/SectorSync.cs | 1 - QSB/TransformSync/TransformSync.cs | 1 - 18 files changed, 5 insertions(+), 31 deletions(-) diff --git a/QSB/Animation/AnimationSync.cs b/QSB/Animation/AnimationSync.cs index 90d4c78f..f72db20c 100644 --- a/QSB/Animation/AnimationSync.cs +++ b/QSB/Animation/AnimationSync.cs @@ -1,7 +1,6 @@ using System; using OWML.ModHelper.Events; using QSB.Messaging; -using QSB.Utility; using UnityEngine; using UnityEngine.Networking; diff --git a/QSB/Events/PlayerLeaveEvent.cs b/QSB/Events/PlayerLeaveEvent.cs index f3ade8e9..bfbd80fb 100644 --- a/QSB/Events/PlayerLeaveEvent.cs +++ b/QSB/Events/PlayerLeaveEvent.cs @@ -1,5 +1,4 @@ using QSB.Messaging; -using QSB.TransformSync; using QSB.Utility; using System.Linq; using UnityEngine; diff --git a/QSB/Events/PlayerProbeLauncherEvent.cs b/QSB/Events/PlayerProbeLauncherEvent.cs index 80939dc6..4a5263b9 100644 --- a/QSB/Events/PlayerProbeLauncherEvent.cs +++ b/QSB/Events/PlayerProbeLauncherEvent.cs @@ -25,7 +25,7 @@ namespace QSB.Events { var player = PlayerRegistry.GetPlayer(message.SenderId); player.UpdateState(State.ProbeLauncher, message.ToggleValue); - player.ProbeLauncher.ChangeEquipState(message.ToggleValue); + player.ProbeLauncher?.ChangeEquipState(message.ToggleValue); } public override void OnReceiveLocal(ToggleMessage message) diff --git a/QSB/Events/PlayerReadyEvent.cs b/QSB/Events/PlayerReadyEvent.cs index 375dd663..38466d84 100644 --- a/QSB/Events/PlayerReadyEvent.cs +++ b/QSB/Events/PlayerReadyEvent.cs @@ -1,9 +1,5 @@ using QSB.Messaging; using QSB.Utility; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace QSB.Events { diff --git a/QSB/Events/PlayerState.cs b/QSB/Events/PlayerState.cs index d64467cb..ab30b21f 100644 --- a/QSB/Events/PlayerState.cs +++ b/QSB/Events/PlayerState.cs @@ -1,7 +1,6 @@ using QSB.Messaging; using QSB.TransformSync; using QSB.Utility; -using System; using UnityEngine.Networking; namespace QSB.Events diff --git a/QSB/Events/PlayerSuitEvent.cs b/QSB/Events/PlayerSuitEvent.cs index fa80b031..ac275a4d 100644 --- a/QSB/Events/PlayerSuitEvent.cs +++ b/QSB/Events/PlayerSuitEvent.cs @@ -1,5 +1,4 @@ using QSB.Messaging; -using QSB.Utility; namespace QSB.Events { diff --git a/QSB/Events/PlayerTranslatorEvent.cs b/QSB/Events/PlayerTranslatorEvent.cs index 81254bd4..6709c484 100644 --- a/QSB/Events/PlayerTranslatorEvent.cs +++ b/QSB/Events/PlayerTranslatorEvent.cs @@ -25,7 +25,7 @@ namespace QSB.Events { var player = PlayerRegistry.GetPlayer(message.SenderId); player.UpdateState(State.Translator, message.ToggleValue); - player.Translator.ChangeEquipState(message.ToggleValue); + player.Translator?.ChangeEquipState(message.ToggleValue); } public override void OnReceiveLocal(ToggleMessage message) diff --git a/QSB/Events/ServerTimeEvent.cs b/QSB/Events/ServerTimeEvent.cs index d2cf5400..b6a88598 100644 --- a/QSB/Events/ServerTimeEvent.cs +++ b/QSB/Events/ServerTimeEvent.cs @@ -1,9 +1,5 @@ using QSB.Messaging; using QSB.TimeSync; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace QSB.Events { diff --git a/QSB/Messaging/MessageType.cs b/QSB/Messaging/MessageType.cs index 2eead544..15b208e7 100644 --- a/QSB/Messaging/MessageType.cs +++ b/QSB/Messaging/MessageType.cs @@ -1,6 +1,4 @@ -using UnityEngine.Networking; - -namespace QSB.Messaging +namespace QSB.Messaging { public enum MessageType { diff --git a/QSB/Messaging/ServerTimeMessage.cs b/QSB/Messaging/ServerTimeMessage.cs index 99459a24..11bf1282 100644 --- a/QSB/Messaging/ServerTimeMessage.cs +++ b/QSB/Messaging/ServerTimeMessage.cs @@ -1,5 +1,4 @@ -using QSB.Messaging; -using UnityEngine.Networking; +using UnityEngine.Networking; namespace QSB.Messaging { diff --git a/QSB/PlayerInfo.cs b/QSB/PlayerInfo.cs index db85d0db..b8f5702e 100644 --- a/QSB/PlayerInfo.cs +++ b/QSB/PlayerInfo.cs @@ -1,5 +1,4 @@ -using System; -using System.Linq; +using System.Linq; using QSB.Tools; using QSB.Utility; using UnityEngine; diff --git a/QSB/PlayerRegistry.cs b/QSB/PlayerRegistry.cs index f76f6f0e..cd2fffb0 100644 --- a/QSB/PlayerRegistry.cs +++ b/QSB/PlayerRegistry.cs @@ -1,11 +1,9 @@ using System.Collections.Generic; using System.Linq; -using QSB.Events; using QSB.TransformSync; using QSB.Animation; using QSB.Utility; using QSB.Messaging; -using System; namespace QSB { diff --git a/QSB/TimeSync/WakeUpSync.cs b/QSB/TimeSync/WakeUpSync.cs index 65dea54d..98d984c1 100644 --- a/QSB/TimeSync/WakeUpSync.cs +++ b/QSB/TimeSync/WakeUpSync.cs @@ -1,7 +1,5 @@ using QSB.Events; using QSB.Messaging; -using QSB.Utility; -using System; using UnityEngine; using UnityEngine.Networking; using UnityEngine.SceneManagement; diff --git a/QSB/Tools/PlayerToolsManager.cs b/QSB/Tools/PlayerToolsManager.cs index feb48072..77d32998 100644 --- a/QSB/Tools/PlayerToolsManager.cs +++ b/QSB/Tools/PlayerToolsManager.cs @@ -1,7 +1,5 @@ using System.Linq; using OWML.ModHelper.Events; -using QSB.Events; -using QSB.Utility; using UnityEngine; namespace QSB.Tools diff --git a/QSB/TransformSync/PlayerCameraSync.cs b/QSB/TransformSync/PlayerCameraSync.cs index 0f059c5b..fbff5104 100644 --- a/QSB/TransformSync/PlayerCameraSync.cs +++ b/QSB/TransformSync/PlayerCameraSync.cs @@ -1,6 +1,5 @@ using QSB.Events; using QSB.Tools; -using QSB.Utility; using UnityEngine; namespace QSB.TransformSync diff --git a/QSB/TransformSync/PlayerTransformSync.cs b/QSB/TransformSync/PlayerTransformSync.cs index d38cc914..b724afb8 100644 --- a/QSB/TransformSync/PlayerTransformSync.cs +++ b/QSB/TransformSync/PlayerTransformSync.cs @@ -1,5 +1,4 @@ using QSB.Animation; -using QSB.Utility; using UnityEngine; namespace QSB.TransformSync diff --git a/QSB/TransformSync/SectorSync.cs b/QSB/TransformSync/SectorSync.cs index ca638ad2..5b5f3958 100644 --- a/QSB/TransformSync/SectorSync.cs +++ b/QSB/TransformSync/SectorSync.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using QSB.Messaging; using UnityEngine; using System.Linq; using QSB.Utility; diff --git a/QSB/TransformSync/TransformSync.cs b/QSB/TransformSync/TransformSync.cs index 9d7608fb..de72c230 100644 --- a/QSB/TransformSync/TransformSync.cs +++ b/QSB/TransformSync/TransformSync.cs @@ -1,5 +1,4 @@ using OWML.Common; -using QSB.Events; using QSB.Utility; using UnityEngine; using UnityEngine.Networking;