From 9da7af7e981087ec0454cd79d140b307bded972e Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sat, 28 Mar 2026 02:52:09 +0100
Subject: [PATCH] .

---
 module/macros/spotlightCombatant.mjs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/macros/spotlightCombatant.mjs b/module/macros/spotlightCombatant.mjs
index c94a0bbc..dc8339ac 100644
--- a/module/macros/spotlightCombatant.mjs
+++ b/module/macros/spotlightCombatant.mjs
@@ -7,9 +7,9 @@ const spotlightCombatantMacro = async token => {
     if (!token)
         return ui.notifications.error(game.i18n.localize('DAGGERHEART.MACROS.Spotlight.errors.noTokenSelected'));
 
-    const combatantCombat = game.combats.find(combat =>
-        combat.combatants.some(x => x.token && x.token.id === token.document.id)
-    );
+    const combatantCombat = token.combatant
+        ? game.combat
+        : game.combats.find(combat => combat.combatants.some(x => x.token && x.token.id === token.document.id));
     if (combatantCombat) {
         const combatant = combatantCombat.combatants.find(x => x.token.id === token.document.id);
         if (!combatantCombat.active) {