From 436b3ed9a0691dadbcc19df152cff51ba68bc6af Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Thu, 2 Dec 2021 02:37:13 -0800 Subject: [PATCH] bubba 2 --- QSB/Anglerfish/TransformSync/AnglerTransformSync.cs | 2 +- QSB/JellyfishSync/TransformSync/JellyfishTransformSync.cs | 2 +- QSB/QSBCore.cs | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/QSB/Anglerfish/TransformSync/AnglerTransformSync.cs b/QSB/Anglerfish/TransformSync/AnglerTransformSync.cs index d37921ac..77833149 100644 --- a/QSB/Anglerfish/TransformSync/AnglerTransformSync.cs +++ b/QSB/Anglerfish/TransformSync/AnglerTransformSync.cs @@ -9,7 +9,7 @@ namespace QSB.Anglerfish.TransformSync { public class AnglerTransformSync : UnsectoredRigidbodySync { - public override bool IsReady => WorldObjectManager.AllAdded; + public override bool IsReady => QSBCore.WorldObjectsAdded; public override bool UseInterpolation => false; private QSBAngler _qsbAngler; diff --git a/QSB/JellyfishSync/TransformSync/JellyfishTransformSync.cs b/QSB/JellyfishSync/TransformSync/JellyfishTransformSync.cs index 1237bf68..f01fd131 100644 --- a/QSB/JellyfishSync/TransformSync/JellyfishTransformSync.cs +++ b/QSB/JellyfishSync/TransformSync/JellyfishTransformSync.cs @@ -11,7 +11,7 @@ namespace QSB.JellyfishSync.TransformSync { public class JellyfishTransformSync : UnsectoredRigidbodySync { - public override bool IsReady => WorldObjectManager.AllAdded; + public override bool IsReady => QSBCore.WorldObjectsAdded; public override bool UseInterpolation => false; private QSBJellyfish _qsbJellyfish; diff --git a/QSB/QSBCore.cs b/QSB/QSBCore.cs index 93dd0944..d9ab3b66 100644 --- a/QSB/QSBCore.cs +++ b/QSB/QSBCore.cs @@ -72,6 +72,7 @@ namespace QSB public static AssetBundle InstrumentAssetBundle { get; private set; } public static AssetBundle ConversationAssetBundle { get; private set; } public static AssetBundle DebugAssetBundle { get; private set; } + public static bool WorldObjectsAdded => WorldObjectManager.AllAdded && IsInMultiplayer && PlayerTransformSync.LocalInstance != null; public static bool WorldObjectsReady => WorldObjectManager.AllReady && IsInMultiplayer && PlayerTransformSync.LocalInstance != null; public static bool IsHost => QNetworkServer.active; public static bool IsInMultiplayer => QNetworkManager.singleton.isNetworkActive;