oops that bug also is on the angler fish lol

This commit is contained in:
JohnCorby 2021-11-10 22:08:57 -08:00
parent a371c71415
commit 15af7e1ce3
3 changed files with 7 additions and 5 deletions

View File

@ -33,6 +33,11 @@ namespace QSB.Anglerfish.Events
private static void OnReceive(bool isHost, AnglerChangeStateMessage message) private static void OnReceive(bool isHost, AnglerChangeStateMessage message)
{ {
if (!QSBCore.WorldObjectsReady)
{
return;
}
var qsbAngler = QSBWorldSync.GetWorldFromId<QSBAngler>(message.ObjectId); var qsbAngler = QSBWorldSync.GetWorldFromId<QSBAngler>(message.ObjectId);
if (isHost) if (isHost)

View File

@ -26,7 +26,7 @@ namespace QSB.MeteorSync.Events
public override void OnReceiveRemote(bool isHost, BoolWorldObjectMessage message) public override void OnReceiveRemote(bool isHost, BoolWorldObjectMessage message)
{ {
if (!WorldObjectManager.AllReady) if (!QSBCore.WorldObjectsReady)
{ {
return; return;
} }

View File

@ -1,9 +1,6 @@
using HarmonyLib; using HarmonyLib;
using OWML.Common;
using QSB.MeteorSync.WorldObjects; using QSB.MeteorSync.WorldObjects;
using QSB.Patches; using QSB.Patches;
using QSB.Player;
using QSB.Utility;
using QSB.WorldSync; using QSB.WorldSync;
using UnityEngine; using UnityEngine;
@ -58,7 +55,7 @@ namespace QSB.MeteorSync.Patches
[HarmonyPatch(typeof(MeteorController), nameof(MeteorController.Launch))] [HarmonyPatch(typeof(MeteorController), nameof(MeteorController.Launch))]
public static void Launch(MeteorController __instance) 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) foreach (var owCollider in __instance._owColliders)
{ {
owCollider.SetActivation(false); owCollider.SetActivation(false);