From 705b4d8dfd6370f608c8e513a4e2dbab27e22814 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Thu, 7 Apr 2022 10:57:32 -0700 Subject: [PATCH 1/2] DebugGui: tweak --- QSB/Utility/DebugGUI.cs | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/QSB/Utility/DebugGUI.cs b/QSB/Utility/DebugGUI.cs index bc222d8e..d230d47a 100644 --- a/QSB/Utility/DebugGUI.cs +++ b/QSB/Utility/DebugGUI.cs @@ -81,6 +81,12 @@ internal class DebugGUI : MonoBehaviour, IAddComponentOnStart return; } + DrawGui(); + DrawWorldObjectLabels(); + } + + private static void DrawGui() + { guiGUIStyle.normal.textColor = Color.white; GUI.contentColor = Color.white; @@ -89,12 +95,6 @@ internal class DebugGUI : MonoBehaviour, IAddComponentOnStart column3Offset = 10f; column4Offset = 10f; - DrawGui(); - DrawWorldObjectLabels(); - } - - private static void DrawGui() - { #region Column1 - Server data WriteLine(1, $"FPS : {Mathf.Round(1f / Time.smoothDeltaTime)}"); @@ -271,11 +271,6 @@ internal class DebugGUI : MonoBehaviour, IAddComponentOnStart foreach (var obj in QSBWorldSync.GetWorldObjects()) { - if (obj.AttachedObject == null) - { - return; - } - if (obj.ShouldDisplayDebug()) { DrawLabel(obj.AttachedObject.transform, obj.ReturnLabel()); @@ -294,11 +289,6 @@ internal class DebugGUI : MonoBehaviour, IAddComponentOnStart foreach (var obj in QSBWorldSync.GetWorldObjects()) { - if (obj.AttachedObject == null) - { - return; - } - if (obj.ShouldDisplayDebug()) { obj.DisplayLines(); From 0104069f46af6737fab6aa8b6fc0237f466a69b7 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Thu, 7 Apr 2022 10:59:25 -0700 Subject: [PATCH 2/2] item remote patches: SetHeldByPlayer for dream lanterns --- QSB/ItemSync/Patches/ItemRemotePatches.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/QSB/ItemSync/Patches/ItemRemotePatches.cs b/QSB/ItemSync/Patches/ItemRemotePatches.cs index 1bbb9ae0..ebcf4740 100644 --- a/QSB/ItemSync/Patches/ItemRemotePatches.cs +++ b/QSB/ItemSync/Patches/ItemRemotePatches.cs @@ -36,7 +36,7 @@ internal class ItemRemotePatches : QSBPatch { __instance._lanternController.enabled = true; __instance._lanternController.SetDetectorScaleCompensation(__instance._lanternController.transform.lossyScale); - // __instance._lanternController.SetHeldByPlayer(true); + __instance._lanternController.SetHeldByPlayer(true); // Locator.GetPlayerController().SetDreamLantern(__instance); } @@ -127,7 +127,7 @@ internal class ItemRemotePatches : QSBPatch if (__instance._lanternController != null) { __instance._lanternController.SetDetectorScaleCompensation(__instance._lanternController.transform.lossyScale); - // __instance._lanternController.SetHeldByPlayer(false); + __instance._lanternController.SetHeldByPlayer(false); __instance._lanternController.enabled = __instance._lanternController.IsLit(); // Locator.GetPlayerController().SetDreamLantern(null); } @@ -195,7 +195,7 @@ internal class ItemRemotePatches : QSBPatch { __instance._lanternController.SetDetectorScaleCompensation(__instance._lanternController.transform.lossyScale); __instance._lanternController.SetSocketed(true); - // __instance._lanternController.SetHeldByPlayer(false); + __instance._lanternController.SetHeldByPlayer(false); __instance._lanternController.enabled = __instance._lanternController.IsLit(); // Locator.GetPlayerController().SetDreamLantern(null); }