Merge branch 'develop'

espositos · Jun 22, 2021 · 50d6d6c · 50d6d6c
2 parents f89557a + c22b673
commit 50d6d6c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,10 @@
 # Changelog
 
-## [1.1.3] 2021-06-20
+## [1.1.4] 2021-06-22
+### Bugfix
+- Fix call for token id resulting in error messages, thanks to jessev14
+
+## [1.1.3] 2021-06-22
 ### Bugfix
 - SWADE BR improvements thanks to zk-sn again
 ### Added

diff --git a/scripts/tokenactionhud.js b/scripts/tokenactionhud.js
@@ -410,7 +410,7 @@ export class TokenActionHUD extends Application {
 
     isRelevantToken(token) {
         let controlled = this.tokens?.controlled;
-        return controlled?.some(t => t.id === this.getTokenId(token.id)) || (controlled?.length === 0 && canvas?.tokens?.placeables?.some(t => t.id === this.targetActions?.tokenId));
+        return controlled?.some(t => t.id === this.getTokenId(token)) || (controlled?.length === 0 && canvas?.tokens?.placeables?.some(t => t.id === this.targetActions?.tokenId));
     }
 
     getTokenId(token) {