Use TAH Core's getControlledTokens()

Larkinabout · Sep 20, 2023 · 358ae27 · 358ae27
1 parent c353d00
commit 358ae27
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/scripts/action-handler.js b/scripts/action-handler.js
@@ -332,7 +332,8 @@ Hooks.once('tokenActionHudCoreApiReady', async (coreModule) => {
                 const info1 = {}
                 let cssClass = ''
                 if (combatType[0] === 'initiative' && game.combat) {
-                    const tokenIds = canvas.tokens.controlled.map((token) => token.id)
+                    const tokens = coreModule.api.Utils.getControlledTokens()
+                    const tokenIds = tokens?.map((token) => token.id)
                     const combatants = game.combat.combatants.filter((combatant) => tokenIds.includes(combatant.tokenId))
 
                     // Get initiative for single token
@@ -1201,7 +1202,8 @@ Hooks.once('tokenActionHudCoreApiReady', async (coreModule) => {
          */
         #getActors () {
             const allowedTypes = ['character', 'npc']
-            const actors = canvas.tokens.controlled.filter(token => token.actor).map((token) => token.actor)
+            const tokens = coreModule.api.Utils.getControlledTokens()
+            const actors = tokens?.filter(token => token.actor).map((token) => token.actor)
             if (actors.every((actor) => allowedTypes.includes(actor.type))) {
                 return actors
             } else {
@@ -1216,8 +1218,8 @@ Hooks.once('tokenActionHudCoreApiReady', async (coreModule) => {
          */
         #getTokens () {
             const allowedTypes = ['character', 'npc']
-            const tokens = canvas.tokens.controlled
-            const actors = tokens.filter(token => token.actor).map((token) => token.actor)
+            const tokens = coreModule.api.Utils.getControlledTokens()
+            const actors = tokens?.filter(token => token.actor).map((token) => token.actor)
             if (actors.every((actor) => allowedTypes.includes(actor.type))) {
                 return tokens
             } else {

diff --git a/scripts/roll-handler.js b/scripts/roll-handler.js
@@ -19,7 +19,7 @@ Hooks.once('tokenActionHudCoreApiReady', async (coreModule) => {
             const actionId = payload[1]
 
             if (!this.actor) {
-                for (const token of canvas.tokens.controlled) {
+                for (const token of coreModule.api.Utils.getControlledTokens()) {
                     const actor = token.actor
                     await this.#handleAction(event, actionType, actor, token, actionId)
                 }

diff --git a/scripts/token-action-hud-dnd5e.min.js b/scripts/token-action-hud-dnd5e.min.js