Fixes for demoralize

ChasarooniZ · May 2, 2024 · 492992a · 492992a
1 parent 40df603
commit 492992a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/scripts/helpers/animation/basicActionAnimation.js b/scripts/helpers/animation/basicActionAnimation.js
@@ -70,13 +70,14 @@ const TODO_LIST = [
 export function createBasicActionAnimation(msg) {
     try {
         const { token: tokenID, target: targetUUID, options, outcome } = msg.flags.pf2e.context;
-        const token = canvas.tokens.get(tokenID);
+        const token = canvas?.tokens?.get(tokenID);
+        const action = options.find((opt) => ACTION_LIST.includes(opt));
+        if (!action || !token) return;
         const isFailure = outcome?.includes("failure");
         const target = canvas.tokens.placeables.find((t) => t.document.uuid === targetUUID.token);
         const isJb2aPremActive = game.modules.get("jb2a_patreon")?.active;
         const isAnimSpellFXCartoonActive = game.modules.get("animated-spell-effects-cartoon")?.active;
         const usersToPlayFor = getMultiVisibleAndMsgVisible([token, target], msg.whisper);
-        const action = options.find((opt) => ACTION_LIST.includes(opt));
 
         const data = {
             token,
@@ -244,7 +245,7 @@ function demoralize(data, seq) {
             .scaleToObject()
             .scale(1)
             .anchor({ x: 0.5, y: 0.7 })
-            .forUsers(getMultiVisibleAndMsgVisible([data.token], msg.whisper))
+            .forUsers(getMultiVisibleAndMsgVisible([data.token], data.whisper))
             .effect()
             .file("animated-spell-effects-cartoon.magic.mind sliver")
             .filter("ColorMatrix", { hue: 180 })