Added guards to Tidy compatibility wire-up code, to prevent console e…

…rrors when an MI actor is not found. Instead, it will return early and return false for enabled checks, to avoid triggering errors.
PwQt · Feb 28, 2024 · 795df4b · 795df4b
1 parent 91f8384
commit 795df4b
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/src/module.js b/src/module.js
@@ -111,10 +111,13 @@ Hooks.once("tidy5e-sheet.ready", (api) => {
         selector: `[data-tab-contents-for="${api.constants.TAB_ID_CHARACTER_SPELLBOOK}"] .scroll-container`,
       },
       enabled(data) {
-        const actor = MagicItemActor.get(data.actor.id);
+        const magicItemActor = MagicItemActor.get(data.actor.id);
+        if (!magicItemActor) {
+          return false;
+        }
         // Required for Tidy to have accurate item data
-        actor.buildItems();
-        return ["character", "npc"].includes(data.actor.type) && actor?.hasItemsSpells();
+        magicItemActor.buildItems();
+        return ["character", "npc"].includes(data.actor.type) && magicItemActor.hasItemsSpells();
       },
       getData(data) {
         return MagicItemActor.get(data.actor.id);
@@ -136,10 +139,13 @@ Hooks.once("tidy5e-sheet.ready", (api) => {
         selector: magicItemFeatureTargetSelector,
       },
       enabled(data) {
-        const actor = MagicItemActor.get(data.actor.id);
+        const magicItemActor = MagicItemActor.get(data.actor.id);
+        if (!magicItemActor) {
+          return false;
+        }
         // Required for Tidy to have accurate item data
-        actor.buildItems();
-        return ["character", "npc"].includes(data.actor.type) && actor?.hasItemsFeats();
+        magicItemActor.buildItems();
+        return ["character", "npc"].includes(data.actor.type) && magicItemActor.hasItemsFeats();
       },
       getData(data) {
         return MagicItemActor.get(data.actor.id);
@@ -151,9 +157,13 @@ Hooks.once("tidy5e-sheet.ready", (api) => {
 // Wire Tidy events and register iterated, data-dependent content
 Hooks.on("tidy5e-sheet.renderActorSheet", (app, element, data) => {
   // Place wand for visible magic items
-  const actor = MagicItemActor.get(data.actor.id);
+  const magicItemActor = MagicItemActor.get(data.actor.id);
   const html = $(element);
-  actor?.items
+  if (!magicItemActor) {
+    return;
+  }
+
+  magicItemActor.items
     .filter((item) => item.visible)
     .forEach((item) => {
       let itemEl = html.find(
@@ -165,7 +175,7 @@ Hooks.on("tidy5e-sheet.renderActorSheet", (app, element, data) => {
     });
 
   // Wire events for custom tidy actor sheet content
-  MagicItemSheet.handleEvents(html, actor);
+  MagicItemSheet.handleEvents(html, magicItemActor);
 });
 
 Hooks.on(`renderItemSheet5e`, (app, html, data) => {