Merge branch 'develop'

espositos · Nov 22, 2020 · 87ae292 · 87ae292
2 parents 3741a5e + 8c3de98
commit 87ae292
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.9.16] 2020-11-21
+### Bugfix
+- DND Check for null combat
+
 ## [0.9.15] 2020-11-21
 ### Bugfix
 - PF1 - Multi token saves now roll correctly.

diff --git a/scripts/actions/dnd5e/dnd5e-actions.js b/scripts/actions/dnd5e/dnd5e-actions.js
@@ -528,6 +528,9 @@ export class ActionHandler5e extends ActionHandler {
     /** @private */
     _addIntiativeSubcategory(macroType, category, tokenId) {
         const combat = game.combat;
+        if (!combat)
+            return;
+
         const combatant = combat.combatants.find(c => c.tokenId === tokenId);
         if (!combatant)
             return;