more fixes

This commit is contained in:
Mister_Nebula 2020-11-28 11:26:59 +00:00
parent 7f3d922410
commit 763aa294ed
5 changed files with 5 additions and 7 deletions

View File

@ -38,7 +38,7 @@ namespace QSB.OrbSync
WorldRegistry.OldOrbList = Resources.FindObjectsOfTypeAll<NomaiInterfaceOrb>().ToList(); WorldRegistry.OldOrbList = Resources.FindObjectsOfTypeAll<NomaiInterfaceOrb>().ToList();
if (NetworkServer.active) if (NetworkServer.active)
{ {
DebugLog.DebugWrite("IS SERVER - INSTANTIATING!"); DebugLog.DebugWrite("- Is server, instantiating orb prefabs.");
WorldRegistry.OrbSyncList.Clear(); WorldRegistry.OrbSyncList.Clear();
WorldRegistry.OldOrbList.ForEach(x => NetworkServer.Spawn(Instantiate(QSBNetworkManager.Instance.OrbPrefab))); WorldRegistry.OldOrbList.ForEach(x => NetworkServer.Spawn(Instantiate(QSBNetworkManager.Instance.OrbPrefab)));
} }

View File

@ -78,7 +78,9 @@ namespace QSB
private void OnSceneLoaded(OWScene scene) private void OnSceneLoaded(OWScene scene)
{ {
DebugLog.DebugWrite("scene loaded");
OrbManager.Instance.BuildOrbs(); OrbManager.Instance.BuildOrbs();
OrbManager.Instance.QueueBuildSlots();
WorldRegistry.OldDialogueTrees.Clear(); WorldRegistry.OldDialogueTrees.Clear();
WorldRegistry.OldDialogueTrees = Resources.FindObjectsOfTypeAll<CharacterDialogueTree>().ToList(); WorldRegistry.OldDialogueTrees = Resources.FindObjectsOfTypeAll<CharacterDialogueTree>().ToList();
} }

View File

@ -21,6 +21,7 @@ namespace QSB
private static void OnCompleteSceneLoad(OWScene oldScene, OWScene newScene) private static void OnCompleteSceneLoad(OWScene oldScene, OWScene newScene)
{ {
DebugLog.DebugWrite($"COMPLETE SCENE LOAD ({oldScene} -> {newScene})", MessageType.Info);
var universe = InUniverse(newScene); var universe = InUniverse(newScene);
OnSceneLoaded?.Invoke(newScene, universe); OnSceneLoaded?.Invoke(newScene, universe);
if (universe) if (universe)

View File

@ -67,7 +67,7 @@ namespace QSB.TimeSync
private void OnSceneLoaded(OWScene scene, bool isInUniverse) private void OnSceneLoaded(OWScene scene, bool isInUniverse)
{ {
QSB.HasWokenUp = false; QSB.HasWokenUp = (scene == OWScene.EyeOfTheUniverse);
if (isInUniverse) if (isInUniverse)
{ {
Init(); Init();

View File

@ -69,11 +69,6 @@ namespace QSB.TransformSync
DebugLog.ToConsole($"Player is null for {AttachedNetId}!", MessageType.Error); DebugLog.ToConsole($"Player is null for {AttachedNetId}!", MessageType.Error);
return; return;
} }
if (ReferenceSector == null)
{
DebugLog.ToConsole($"ReferenceSector is null for {AttachedNetId}!", MessageType.Error);
return;
}
if (_disabledSocket == null) if (_disabledSocket == null)
{ {
DebugLog.ToConsole($"DisabledSocket is null for {AttachedNetId}! (ProbeLauncher null? : {Player.ProbeLauncher == null})", MessageType.Error); DebugLog.ToConsole($"DisabledSocket is null for {AttachedNetId}! (ProbeLauncher null? : {Player.ProbeLauncher == null})", MessageType.Error);