Merge pull request #22 from AngryBeaver/pf2e

bug fix
AngryBeaver · Feb 6, 2023 · 1930fe3 · 1930fe3
2 parents d4308a2 + d4c3347
commit 1930fe3
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 10 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,11 @@
 # Changelog
 ## 2.3.x feature system independent
+## 2.3.1 bug pulling items from compendium
+fixed: when dropping items from compendium they no longer have an itemType thus they will not be detected correctly as equal to any item on actor.
+
+fixed: when one recipe refers to an item no longer in this world you could not open the compendium browser
+## 2.3.0 feature system independent
+
 ⚠️This module now depends on other modules to work, you need to enable them ⚠️
 
 This module can now run on multiple systems. 

diff --git a/module.json b/module.json
@@ -2,7 +2,7 @@
     "title": "Beaver's Crafting Module",
     "description": "A Crafting Module for DnD",
     "id": "beavers-crafting",
-    "version": "2.3.0",
+    "version": "2.3.1",
     "authors": [
       {
         "name": "angryBeaver",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "beavers-crafting",
 	"title": "Beaver's Crafting",
-	"version": "2.3.0",
+	"version": "2.3.1",
 	"description": "Crafting",
 	"devDir": "C:\\Users\\Riess\\AppData\\Local\\FoundryVTT\\Data\\modules",
 	"main": "src/main.js",

diff --git a/src/Recipe.ts b/src/Recipe.ts
@@ -116,7 +116,9 @@ export class Recipe implements RecipeData {
     addAttendant(entity, uuid, type) {
         const uuidS = sanitizeUuid(uuid);
         if (!this.attendants[uuidS]) {
-            this.attendants[uuidS] = beaversSystemInterface.componentCreate({...entity,uuid:uuid,type:type});
+            this.attendants[uuidS] = beaversSystemInterface.componentFromEntity(entity);
+            this.attendants[uuidS].uuid = uuid;
+            this.attendants[uuidS].type = type;
         } else {
             this.attendants[uuidS].quantity = this.attendants[uuidS].quantity+1;
         }
@@ -130,7 +132,9 @@ export class Recipe implements RecipeData {
     addIngredient(entity, uuid, type) {
         const uuidS = sanitizeUuid(uuid);
         if (!this.ingredients[uuidS]) {
-            this.ingredients[uuidS] = beaversSystemInterface.componentCreate({...entity,uuid:uuid,type:type});
+            this.ingredients[uuidS] = beaversSystemInterface.componentFromEntity(entity);
+            this.ingredients[uuidS].uuid = uuid;
+            this.ingredients[uuidS].type = type;
         } else {
             this.ingredients[uuidS].quantity = this.ingredients[uuidS].quantity+1;
         }
@@ -144,7 +148,9 @@ export class Recipe implements RecipeData {
     addResult(entity, uuid, type) {
         const uuidS = sanitizeUuid(uuid);
         if (!this.results[uuidS]) {
-            this.results[uuidS] = beaversSystemInterface.componentCreate({...entity,uuid:uuid,type:type});
+            this.results[uuidS] = beaversSystemInterface.componentFromEntity(entity);
+            this.results[uuidS].uuid = uuid;
+            this.results[uuidS].type = type;
         } else {
             this.results[uuidS].quantity = this.results[uuidS].quantity+1;
         }

diff --git a/src/apps/RecipeCompendium.ts b/src/apps/RecipeCompendium.ts
@@ -85,11 +85,16 @@ export class RecipeCompendium {
     static async isAnyAnyOfInList(listOfAnyOfIngredients: Component[], listOfItems) {
         for (const component of listOfAnyOfIngredients) {
             if (component.type === Settings.ANYOF_SUBTYPE) {
-                const item = await component.getEntity();
-                const anyOf = new AnyOf(item);
-                const results = await anyOf.filter(listOfItems);
-                if (results.filter(c => c.quantity >= component.quantity).length == 0) {
-                    return false;
+                try {
+                    const item = await component.getEntity();
+                    const anyOf = new AnyOf(item);
+                    const results = await anyOf.filter(listOfItems);
+                    if (results.filter(c => c.quantity >= component.quantity).length == 0) {
+                        return false;
+                    }
+                }catch(error)
+                {
+                    console.warn(error);
                 }
             }
         }