diff --git a/QSB/QuantumSync/Patches/QuantumVisibilityPatches.cs b/QSB/QuantumSync/Patches/QuantumVisibilityPatches.cs index c02829ea..ceaa6644 100644 --- a/QSB/QuantumSync/Patches/QuantumVisibilityPatches.cs +++ b/QSB/QuantumSync/Patches/QuantumVisibilityPatches.cs @@ -1,6 +1,5 @@ using QSB.Patches; using QSB.Player; -using QSB.Utility; using QSB.WorldSync; using System.Linq; using System.Reflection; @@ -32,15 +31,11 @@ namespace QSB.QuantumSync.Patches QSBCore.Helper.HarmonyHelper.Unpatch("OnDisable"); } - public static void Shape_OnEnable(Shape __instance) - { - QSBWorldSync.RaiseEvent(__instance, "OnShapeActivated", __instance); - } + public static void Shape_OnEnable(Shape __instance) + => QSBWorldSync.RaiseEvent(__instance, "OnShapeActivated", __instance); - public static void Shape_OnDisable(Shape __instance) - { - QSBWorldSync.RaiseEvent(__instance, "OnShapeDeactivated", __instance); - } + public static void Shape_OnDisable(Shape __instance) + => QSBWorldSync.RaiseEvent(__instance, "OnShapeDeactivated", __instance); // ShapeVisibilityTracker patches diff --git a/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs b/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs index 426e52ea..36001373 100644 --- a/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs +++ b/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs @@ -5,7 +5,6 @@ using QSB.Utility; using QSB.WorldSync; using System.Collections.Generic; using System.Linq; -using UnityEngine; namespace QSB.QuantumSync.WorldObjects { diff --git a/QSB/SectorSync/QSBSectorManager.cs b/QSB/SectorSync/QSBSectorManager.cs index b78773d3..a3001675 100644 --- a/QSB/SectorSync/QSBSectorManager.cs +++ b/QSB/SectorSync/QSBSectorManager.cs @@ -87,8 +87,8 @@ namespace QSB.SectorSync return null; } - var listToCheck = SectorList.Count == 0 - ? QSBWorldSync.GetWorldObjects() + var listToCheck = SectorList.Count == 0 + ? QSBWorldSync.GetWorldObjects() : SectorList; return listToCheck .Where(sector => sector.AttachedObject != null diff --git a/QSB/WorldSync/QSBWorldSync.cs b/QSB/WorldSync/QSBWorldSync.cs index 36fb800c..16f607c3 100644 --- a/QSB/WorldSync/QSBWorldSync.cs +++ b/QSB/WorldSync/QSBWorldSync.cs @@ -19,10 +19,10 @@ namespace QSB.WorldSync public static List ShipLogFacts { get; } = new List(); private static readonly List WorldObjects = new List(); - private const BindingFlags Flags = BindingFlags.Instance - | BindingFlags.Static - | BindingFlags.Public - | BindingFlags.NonPublic + private const BindingFlags Flags = BindingFlags.Instance + | BindingFlags.Static + | BindingFlags.Public + | BindingFlags.NonPublic | BindingFlags.DeclaredOnly; public static IEnumerable GetWorldObjects()