From 0fe1194b7e278ce8f004761e3d102a39e96ada27 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sun, 28 Dec 2025 14:03:55 +0100
Subject: [PATCH] .

---
 module/dice/dualityRoll.mjs | 2 +-
 module/documents/actor.mjs  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/dice/dualityRoll.mjs b/module/dice/dualityRoll.mjs
index 91c0a197..d2e20213 100644
--- a/module/dice/dualityRoll.mjs
+++ b/module/dice/dualityRoll.mjs
@@ -298,7 +298,7 @@ export default class DualityRoll extends D20Roll {
 
         if (looseSpotlight && game.combat?.active) {
             const currentCombatant = game.combat.combatants.get(game.combat.current?.combatantId);
-            if (currentCombatant?.actorId == actor.id) ui.combat.setCombatantSpotlight(currentCombatant.id);
+            if (currentCombatant?.actorId == config.data.id) ui.combat.setCombatantSpotlight(currentCombatant.id);
         }
     }
 
diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs
index 9f4db5e2..6080eb87 100644
--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@@ -543,6 +543,7 @@ export default class DhpActor extends Actor {
         /* system gets repeated infinately which causes issues when trying to use the data for document creation */
         delete rollData.system;
 
+        rollData.id = this.id;
         rollData.name = this.name;
         rollData.system = this.system.getRollData();
         rollData.prof = this.system.proficiency ?? 1;