Rare case bugfix

JustArion · Feb 23, 2021 · e7d061e · e7d061e
1 parent 3bfac69
commit e7d061e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/AssemblyInfo.cs b/AssemblyInfo.cs
@@ -12,7 +12,7 @@ internal static class AssemblyInfo
     {
         internal const string Name = "MicSensitivity";
 
-        internal const string Version = "1.4";
+        internal const string Version = "1.4.1";
 
         internal const string Description = "";
 

diff --git a/Core.cs b/Core.cs
@@ -12,11 +12,11 @@ namespace Dawn
 {
     internal static class Core
     {
-        internal static ApiWorld currentRoom => FindInstance(typeof(RoomManager), typeof(ApiWorld)).TryCast<ApiWorld>();
+        private static ApiWorld currentRoom => FindInstance(typeof(RoomManager), typeof(ApiWorld)).TryCast<ApiWorld>();
 
-        internal static ApiWorldInstance currentWorldInstance => FindInstance(typeof(RoomManager), typeof(ApiWorldInstance)).TryCast<ApiWorldInstance>();
+        private static ApiWorldInstance currentWorldInstance => FindInstance(typeof(RoomManager), typeof(ApiWorldInstance)).TryCast<ApiWorldInstance>();
 
-        internal static bool IsInWorld => currentRoom != null || currentWorldInstance != null;
+        private static bool IsInWorld => currentRoom != null || currentWorldInstance != null;
         private static float infoIndex;
         internal static float userVolumeThreshold
         {
@@ -65,6 +65,7 @@ internal static IEnumerator WorldJoinedCoroutine()
                 { 
                     yield return new WaitForSeconds(1);
                     {
+                        if (uInstance == null) yield return new WaitForSeconds(1); // 1 Extra check for the rare case scenario that uInstance is not set up fast enough from CurrentUser -> uInstance.
                         SensitivitySetup();
                     }
                     sw.Stop();
@@ -79,7 +80,7 @@ internal static IEnumerator WorldJoinedCoroutine()
                 yield return new WaitForSeconds(1);
             }
         }
-        internal static Il2CppSystem.Object FindInstance(Type WhereLooking, Type WhatLooking) // Credits to Teo
+        private static Il2CppSystem.Object FindInstance(Type WhereLooking, Type WhatLooking) // Credits to Teo
         {
             try
             {
@@ -106,7 +107,7 @@ private static PropertyInfo GetInfo(string originalValue)
 
         private static PropertyInfo VolumePeakInfo;
         private static PropertyInfo VolumeThreasholdInfo;
-        internal static USpeaker uInstance => CurrentUser.field_Private_USpeaker_0;
+        private static USpeaker uInstance => CurrentUser.field_Private_USpeaker_0;
         internal static void InternalConfigRefresh() //The Divide by 10k sets it back to a managable float number
         {
             SensitivityValue = MelonPreferences.GetEntryValue<float>("MicSensitivity", "Mic - Microphone Sensitivity") / 10000;
@@ -127,7 +128,7 @@ internal static void Log(object obj)
         /// <summary>
         /// Returns the Current User aka the Player object.
         /// </summary>
-        internal static VRCPlayer CurrentUser
+        private static VRCPlayer CurrentUser
         {
             get
             {

diff --git a/MicSensitivity.cs b/MicSensitivity.cs
@@ -1,10 +1,9 @@
-using Harmony;
-using MelonLoader;
+using MelonLoader;
 using static Dawn.Core;
 
 namespace Dawn.Mic
 {
-    internal class MicSensitivity : MelonMod
+    internal sealed class MicSensitivity : MelonMod
     {
         #region MelonMod Native
         public override void OnApplicationStart()
@@ -15,6 +14,7 @@ public override void OnApplicationStart()
             InternalConfigRefresh();
         } //Settings Registration and Refresh
 
+
         public override void OnSceneWasLoaded(int buildIndex, string sceneName) // World Join
         {
             switch (buildIndex) //Prevents being called 3x