Merge pull request #82 from p4535992/main

Fix annoying flags null pointer errors for better integration with other modules
AngryBeaver · Sep 15, 2023 · 4111a7c · 4111a7c
2 parents 88dea3d + 51e0dfe
commit 4111a7c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/src/AnyOf.ts b/src/AnyOf.ts
@@ -12,13 +12,13 @@ export class AnyOf {
         return (
             item?.type === beaversSystemInterface.configLootItemType && (
                 item?.system?.source === Settings.ANYOF_SUBTYPE ||
-                item?.flags["beavers-crafting"]?.subtype === Settings.ANYOF_SUBTYPE
+                getProperty(item,`flags.beavers-crafting.subtype`) === Settings.ANYOF_SUBTYPE
             )
         );
     }
 
     constructor(item) {
-        const flags = item.flags[Settings.NAMESPACE]?.anyOf;
+        const flags = getProperty(item,`flags.${Settings.NAMESPACE}.anyOf`) || {};
         const data = mergeObject(this.defaultData(), flags || {}, {inplace: false});
         this.macro = data.macro;
         this.img = item.img;

diff --git a/src/Crafting.ts b/src/Crafting.ts
@@ -503,7 +503,7 @@ export class Crafting implements CraftingData {
                 }
             }
         };
-        update.flags["beavers-crafting"].crafting[uuid] = this.serialize();
+        setProperty(update, `flags.beavers-crafting.crafting.${uuid}`, this.serialize());
         await this.actor.update(update);
     }
 

diff --git a/src/Recipe.ts b/src/Recipe.ts
@@ -55,13 +55,13 @@ export class Recipe implements RecipeData {
         // @ts-ignore
         return (item?.type === beaversSystemInterface.configLootItemType && (
                 item?.system?.source === Settings.RECIPE_SUBTYPE ||
-                item?.flags["beavers-crafting"]?.subtype === Settings.RECIPE_SUBTYPE
+                getProperty(item, `flags.beavers-crafting.subtype`) === Settings.RECIPE_SUBTYPE
             )
         )
     }
 
     static fromItem(item): Recipe {
-        const flags = item.flags[Settings.NAMESPACE]?.recipe;
+        const flags = getProperty(item,`flags.${Settings.NAMESPACE}.recipe`) || {};
         const data = mergeObject({input: {}, output: {}, required: {}}, flags || {}, {inplace: false});
         return new Recipe(item.uuid, item.id, item.name, item.img, data);
     }

diff --git a/src/apps/ActorSheetTab.ts b/src/apps/ActorSheetTab.ts
@@ -26,7 +26,7 @@ export class ActorSheetTab {
 
     async init() {
         const label = game["i18n"].localize("beaversCrafting.actorSheet.tab");
-        const flag = this.app.actor.flags["beavers-crafting"]?.crafting || {};
+        const flag = getProperty(this.app.actor,`flags.beavers-crafting.crafting`) || {};
         const unsortedFolders = {};
         for(const [x,y] of Object.entries(flag)){
             const craftingData = (y as CraftingData);

diff --git a/src/main.js b/src/main.js
@@ -68,7 +68,7 @@ Hooks.once("beavers-system-interface.ready", async function(){
 
 //Recipe remap use action
     Hooks.on(`dnd5e.preUseItem`, (item, config, options) => {
-        if(item.flags[Settings.NAMESPACE]?.recipe){
+        if(getProperty(item, `flags.${Settings.NAMESPACE}.recipe`)){
             Crafting.fromOwned(item).craft();
             return false;
         }
@@ -83,10 +83,10 @@ Hooks.once("beavers-system-interface.ready", async function(){
 
 //add Subtype to create Item
     Hooks.on("preCreateItem", (doc, createData, options, user) => {
-        if (createData.flags["beavers-crafting"]?.subtype === 'recipe' ) {
+        if (getProperty(createData, `flags.beavers-crafting.subtype`) === 'recipe' ) {
             doc.updateSource({"flags.beavers-crafting.subtype": Settings.RECIPE_SUBTYPE,"img":"icons/sundries/scrolls/scroll-worn-tan.webp"});
         }
-        if (createData.flags["beavers-crafting"]?.subtype === 'anyOf' ) {
+        if (getProperty(createData,`flags.beavers-crafting.subtype`) === 'anyOf' ) {
             doc.updateSource({"flags.beavers-crafting.subtype": Settings.ANYOF_SUBTYPE,"img":"modules/beavers-crafting/icons/anyOf.png"});
         }
     });

diff --git a/src/migration.ts b/src/migration.ts
@@ -83,7 +83,7 @@ export async function migrateRecipeSkillToTests() {
                 ui.notifications?.warn("Beavers Crafting |" + e);
             }
         }
-        const flag = actor.flags["beavers-crafting"]?.crafting || {};
+        const flag = getProperty(actor, `flags.beavers-crafting.crafting`) || {};
         for (const [x, y] of Object.entries(flag)) {
             try {
                 const craftingData = (y as CraftingData);
@@ -120,7 +120,7 @@ export async function migrateDeprecateTools() {
                 ui.notifications?.warn("Beavers Crafting |" + e);
             }
         }
-        const flag = actor.flags["beavers-crafting"]?.crafting || {};
+        const flag = getProperty(actor, `flags.beavers-crafting.crafting`) || {};
         for (const [x, y] of Object.entries(flag)) {
             try {
                 const craftingData = (y as CraftingData);
-Original file line number
+Diff line change
@@ Expand Up / @@ -503,7 +503,7 @@ export class Crafting implements CraftingData { @@
                     }
                 }
             };
-            update.flags["beavers-crafting"].crafting[uuid] = this.serialize();
+            setProperty(update, `flags.beavers-crafting.crafting.${uuid}`, this.serialize());
             await this.actor.update(update);
         }
@@ Expand Down @@