Merge pull request #32 from zambony/preview

1.5.6 fixes
zambony · Dec 7, 2022 · 9685715 · 9685715
2 parents c3cb654 + 9e65deb
commit 9685715
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/CommandHandler.cs b/src/CommandHandler.cs
@@ -338,6 +338,8 @@ public void Goto(Player player)
             }
 
             Player.m_localPlayer.transform.position = player.transform.position - (player.transform.forward * 1.5f) + (Vector3.up * 2f);
+
+            Logger.Log($"Teleporting to {player.GetPlayerName().WithColor(Logger.GoodColor)}...");
         }
 
         [Command("ghost", "Toggles ghost mode. Prevents hostile creatures from detecting you.")]
@@ -803,7 +805,7 @@ public void SetSkill(string skillName, int level)
             level = Mathf.Clamp(level, 0, 100);
 
             Player.m_localPlayer.GetSkills().CheatResetSkill(targetSkill);
-            Player.m_localPlayer.GetSkills().CheatRaiseSkill(targetSkill, level);
+            Player.m_localPlayer.GetSkills().CheatRaiseSkill(targetSkill, level, false);
 
             Logger.Log($"Set {targetSkill.WithColor(Logger.GoodColor)} to level {level.ToString().WithColor(Logger.GoodColor)}.", true);
         }
@@ -1503,7 +1505,7 @@ public void Run(string text)
             {
                 command.method.Invoke(this, convertedArgs.ToArray());
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 Logger.Error($"Something happened while running {command.data.keyword.WithColor(Color.white)}, check the BepInEx console for more details.", true);
                 throw;

diff --git a/src/Gungnir.cs b/src/Gungnir.cs
@@ -16,7 +16,7 @@ public class Gungnir : BaseUnityPlugin
         public const string ModName    = "Gungnir";
         public const string ModOrg     = "zamboni";
         public const string ModGUID    = ModOrg + "." + ModName;
-        public const string ModVersion = "1.5.4";
+        public const string ModVersion = "1.5.5";
 
         private readonly Harmony m_harmony = new Harmony(ModGUID);
         private CommandHandler   m_handler = new CommandHandler();

diff --git a/src/Util.cs b/src/Util.cs
@@ -231,7 +231,7 @@ public static string Simplified(this string value)
         /// <returns>The prefab.</returns>
         public static GameObject GetHiddenPrefab(string name)
         {
-            if (s_cachedPrefabs.TryGetValue(name.ToLower(), out GameObject ret))
+            if (s_cachedPrefabs.TryGetValue(name.ToLower(), out GameObject ret) && ret != null)
                 return ret;
 
             var objects = Resources.FindObjectsOfTypeAll<Transform>()
@@ -242,6 +242,9 @@ public static GameObject GetHiddenPrefab(string name)
             {
                 if (prefab.name.Equals(name, StringComparison.OrdinalIgnoreCase))
                 {
+                    if (s_cachedPrefabs.ContainsKey(name.ToLower()))
+                        s_cachedPrefabs.Remove(name.ToLower());
+
                     s_cachedPrefabs.Add(name.ToLower(), prefab);
                     return prefab;
                 }