Fix token selector again

dmrickey · Jul 25, 2024 · e5b8da5 · e5b8da5
1 parent 28b06e8
commit e5b8da5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/handlebars-handlers/targeted/targets/token-selector-app.mjs b/src/handlebars-handlers/targeted/targets/token-selector-app.mjs
@@ -45,7 +45,7 @@ export class TokenSelectorApp extends DocumentSheet {
             game.i18n.localize('TOKEN.DISPOSITION.' + Object.entries(CONST.TOKEN_DISPOSITIONS).find(([ /** @type{string */_, value]) => value === disposition)?.[0] || '');
 
         const currentTargetUuids = [...game.user.targets].map(x => x.document.uuid);
-        const availableTargets = game.user.viewedScene.tokens
+        const availableTargets = game.scenes.get(game.user.viewedScene)?.tokens
             .filter((token) => token.actor && token.object.isVisible && token.actor.id !== item.actor?.id)
             .map((token) => ({
                 id: token.id,
@@ -55,7 +55,7 @@ export class TokenSelectorApp extends DocumentSheet {
                 uuid: token.uuid,
                 dispositionLabel: getDispositionLabel(token.disposition),
                 checked: currentTargetUuids.includes(token.uuid),
-            }));
+            })) ?? [];
 
         availableTargets.sort((a, b) => {
             const first = a.disposition - b.disposition;

diff --git a/types/foundry/client/data/documents/user.d.ts b/types/foundry/client/data/documents/user.d.ts
@@ -11,6 +11,6 @@ declare global {
          */
         targets: UserTargets;
         isGM: boolean;
-        viewedScene: Scene;
+        viewedScene: string;
     }
 }