fix: fixes bug preventing adding players via the "Add Creature" button (

#197)
javalent · Aug 16, 2023 · 3e5cc4d · 3e5cc4d
1 parent 169cc7d
commit 3e5cc4d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/encounter/index.ts b/src/encounter/index.ts
@@ -154,10 +154,6 @@ export class EncounterParser {
                     )
             );
         }
-        console.log(
-            "🚀 ~ file: index.ts:158 ~ playersToReturn:",
-            playersToReturn
-        );
         return Array.from(new Set(playersToReturn));
     }
     async parseRawCreatures(rawMonsters: RawCreatureArray) {

diff --git a/src/main.ts b/src/main.ts
@@ -186,6 +186,17 @@ export default class InitiativeTracker extends Plugin {
         let creature = this.getBaseCreatureFromBestiary(name);
         if (creature) return Creature.from(creature);
     }
+    getCreatureFromBestiaryByDefinition(
+        creature: SRDMonster | HomebrewCreature
+    ): Creature {
+        if (creature.player && this.playerCreatures.has(creature.name)) {
+            return this.playerCreatures.get(creature.name);
+        }
+        return (
+            this.getCreatureFromBestiary(creature.name) ??
+            Creature.from(creature)
+        );
+    }
     get statblock_players() {
         return this.statblock_creatures
             .filter((p) => p.player)

diff --git a/src/utils/suggester.ts b/src/utils/suggester.ts
@@ -342,13 +342,13 @@ export class SRDMonsterSuggestionModal extends SuggestionModal<
     }
     onChooseItem(item: HomebrewCreature | SRDMonster) {
         this.inputEl.value = item.name;
-        this.creature = this.plugin.getBaseCreatureFromBestiary(item.name);
+        this.creature = this.plugin.getCreatureFromBestiaryByDefinition(item);
         this.onClose();
         this.close();
     }
     selectSuggestion({ item }: FuzzyMatch<HomebrewCreature | SRDMonster>) {
         this.inputEl.value = item.name;
-        this.creature = this.plugin.getBaseCreatureFromBestiary(item.name);
+        this.creature = this.plugin.getCreatureFromBestiaryByDefinition(item);
         this.onClose();
         this.close();
     }