cleanup (aleks's suggestions)

qsb-dev · Sep 22, 2020 · 71d6a45 · 71d6a45
1 parent 22b6609
commit 71d6a45
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 23 deletions.
diff --git a/QSB/OrbSync/OrbSlotManager.cs b/QSB/OrbSync/OrbSlotManager.cs
@@ -6,11 +6,6 @@ namespace QSB.OrbSync
     public class OrbSlotManager : MonoBehaviour
     {
         private void Awake()
-        {
-            QSBSceneManager.OnSceneLoaded += OnSceneLoaded;
-        }
-
-        private void OnSceneLoaded(OWScene scene, bool isInUniverse)
         {
             QSB.Helper.Events.Unity.RunWhen(() => QSB.HasWokenUp, InitSlots);
         }
@@ -22,7 +17,6 @@ private void InitSlots()
             {
                 var qsbOrbSlot = WorldRegistry.GetObject<QSBOrbSlot>(id) ?? new QSBOrbSlot();
                 qsbOrbSlot.Init(orbSlots[id], id);
-                WorldRegistry.AddObject(qsbOrbSlot);
             }
         }
     }

diff --git a/QSB/OrbSync/QSBOrbSlot.cs b/QSB/OrbSync/QSBOrbSlot.cs
@@ -14,6 +14,7 @@ public void Init(NomaiInterfaceSlot slot, int id)
             ObjectId = id;
             InterfaceSlot = slot;
             _initialized = true;
+            WorldRegistry.AddObject(this);
         }
 
         public void HandleEvent(bool state)

diff --git a/QSB/Utility/DebugLog.cs b/QSB/Utility/DebugLog.cs
@@ -14,14 +14,6 @@ public static void ToConsole(string message, MessageType type = MessageType.Mess
                 .GetMethods(System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)
                 .Last(x => x.Name == "WriteLine");
             var callingType = GetCallingType(new StackTrace());
-            if (callingType == "DebugLog")
-            {
-                callingType = GetCallingType(new StackTrace(), 2);
-            }
-            if (callingType == "DebugLog")
-            {
-                callingType = GetCallingType(new StackTrace(), 3);
-            }
             method.Invoke(console, new object[] { type, message, callingType });
         }
 
@@ -56,16 +48,10 @@ public static void LogState(string name, bool state)
             DebugWrite($"* {name} {status}", messageType);
         }
 
-        private static string GetCallingType(StackTrace frame, int index = 1)
+        private static string GetCallingType(StackTrace frame)
         {
-            try
-            {
-                return frame.GetFrame(index).GetMethod().DeclaringType.Name;
-            }
-            catch
-            {
-                return "";
-            }
+            var stackFrame = frame.GetFrames().First(x => x.GetMethod().DeclaringType.Name != "DebugLog");
+            return stackFrame.GetMethod().DeclaringType.Name;
         }
     }
 }