Merge branch 'develop'

espositos · Sep 16, 2020 · 4123a63 · 4123a63
2 parents 421cb57 + fcde562
commit 4123a63
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.7.14] 2020-09-16
+### Bugfix
+- MagicItemExtender - embarrassingly failed to apply De Morgan's law properly when checking null inventory
+
 ## [0.7.13] 2020-09-16
 ### Bugfix
 - PF2e - Something I don't understand with skill checks was failing

diff --git a/scripts/actions/dnd5e/magicItemsExtender.js b/scripts/actions/dnd5e/magicItemsExtender.js
@@ -18,7 +18,7 @@ export class MagicItemActionListExtender extends ActionListExtender {
         let itemCategories = actionList.categories.find(c => c.id === 'inventory');
         let actor = MagicItems.actor(actorId);
 
-        if (!(actor || itemCategories))
+        if (!(actor && itemCategories))
             return;
 
         let magicItems = actor.items ?? [];