Fix missing clothing in style menu

Closes #34
joeyparrish · Jul 24, 2022 · 6af92de · 6af92de
1 parent 1754f73
commit 6af92de
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/Pokeheim/DressUp.cs b/Pokeheim/DressUp.cs
@@ -98,7 +98,11 @@ public Option(string name, string prefabName) {
       public static void RegisterAllClothing() {
         // Seek out all clothing and build the menus dynamically.
         foreach (var prefab in ZNetScene.instance.m_prefabs) {
-          RegisterIfClothing(prefab);
+          try {
+            RegisterIfClothing(prefab);
+          } catch (Exception ex) {
+            Logger.LogError($"Exception registering possible clothing {prefab}: {ex}");
+          }
         }
       }
 

diff --git a/Pokeheim/Utils.cs b/Pokeheim/Utils.cs
@@ -49,7 +49,7 @@ public static class Utils {
     public static Hook OnRPCsReady =
         new Hook("OnRPCsReady", oneShot: false);
     public static Hook OnDLCManAwake =
-        new Hook("OnDLCManAwake");
+        new Hook("OnDLCManAwake", oneShot: false);
 
     [HarmonyPatch]
     private static class HookPatches {
@@ -66,7 +66,10 @@ private static class HookPatches {
       private static void RPCsReady() => OnRPCsReady.Trigger();
 
       [HarmonyPatch(typeof(DLCMan), nameof(DLCMan.Awake)), HarmonyPostfix]
-      private static void DLC() => OnDLCManAwake.Trigger();
+      private static void DLCAwake() => OnDLCManAwake.Trigger();
+
+      [HarmonyPatch(typeof(DLCMan), nameof(DLCMan.OnDestroy)), HarmonyPostfix]
+      private static void DLCDead() => OnDLCManAwake.Untrigger();
     }
 
     public class Hook {
@@ -110,6 +113,11 @@ internal void Trigger() {
         }
       }
 
+      internal void Untrigger() {
+        triggered = false;
+        Logger.LogDebug($"Untriggering hook {name}");
+      }
+
       private void SafeInvoke(Action callback) {
         try {
           callback();