From 740216ada2bc86d2a5b5aa517101649bd6006352 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sat, 28 Mar 2026 03:09:41 +0100
Subject: [PATCH] Fixed spotlight case outside of combat

---
 module/canvas/placeables/token.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/canvas/placeables/token.mjs b/module/canvas/placeables/token.mjs
index 77d8c3f4..77c178d6 100644
--- a/module/canvas/placeables/token.mjs
+++ b/module/canvas/placeables/token.mjs
@@ -20,7 +20,7 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
             .get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.SpotlightTracker)
             .spotlightedTokens.has(this.document.uuid);
 
-        const turnIsSet = game.combat?.turn !== null;
+        const turnIsSet = typeof game.combat?.turn === 'number';
         const isTurn = game.combat?.combatant?.tokenId === this.id;
         const markerActive = markersEnabled && turnIsSet ? isTurn : spotlighted;