diff --git a/QSB/Anglerfish/Events/AnglerChangeStateEvent.cs b/QSB/Anglerfish/Events/AnglerChangeStateEvent.cs index 98542349..d4eb3df0 100644 --- a/QSB/Anglerfish/Events/AnglerChangeStateEvent.cs +++ b/QSB/Anglerfish/Events/AnglerChangeStateEvent.cs @@ -33,6 +33,11 @@ namespace QSB.Anglerfish.Events private static void OnReceive(bool isHost, AnglerChangeStateMessage message) { + if (!QSBCore.WorldObjectsReady) + { + return; + } + var qsbAngler = QSBWorldSync.GetWorldFromId(message.ObjectId); if (isHost) diff --git a/QSB/MeteorSync/Events/MeteorLaunchEvent.cs b/QSB/MeteorSync/Events/MeteorLaunchEvent.cs index a64ac4f7..90b2f419 100644 --- a/QSB/MeteorSync/Events/MeteorLaunchEvent.cs +++ b/QSB/MeteorSync/Events/MeteorLaunchEvent.cs @@ -26,7 +26,7 @@ namespace QSB.MeteorSync.Events public override void OnReceiveRemote(bool isHost, BoolWorldObjectMessage message) { - if (!WorldObjectManager.AllReady) + if (!QSBCore.WorldObjectsReady) { return; } diff --git a/QSB/MeteorSync/Patches/MeteorClientPatches.cs b/QSB/MeteorSync/Patches/MeteorClientPatches.cs index eccec173..4c5d8aee 100644 --- a/QSB/MeteorSync/Patches/MeteorClientPatches.cs +++ b/QSB/MeteorSync/Patches/MeteorClientPatches.cs @@ -1,9 +1,6 @@ using HarmonyLib; -using OWML.Common; using QSB.MeteorSync.WorldObjects; using QSB.Patches; -using QSB.Player; -using QSB.Utility; using QSB.WorldSync; using UnityEngine; @@ -58,7 +55,7 @@ namespace QSB.MeteorSync.Patches [HarmonyPatch(typeof(MeteorController), nameof(MeteorController.Launch))] public static void Launch(MeteorController __instance) { - // display collisions again because we are client and have no say + // disable stuff again because we are client and have no say foreach (var owCollider in __instance._owColliders) { owCollider.SetActivation(false);