From 02b685a8fd09cb81f2bdb38529093df7c8b975d1 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sat, 18 Jul 2026 18:54:29 +0200
Subject: [PATCH] Fixed DiceSoNice rolling on damage

---
 module/applications/ui/chatLog.mjs                     | 4 ++--
 module/dice/damageRoll.mjs                             | 7 ++++---
 module/systemRegistration/migration-handlers/2_5_2.mjs | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/module/applications/ui/chatLog.mjs b/module/applications/ui/chatLog.mjs
index c6309e36..e29ed990 100644
--- a/module/applications/ui/chatLog.mjs
+++ b/module/applications/ui/chatLog.mjs
@@ -110,7 +110,7 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
                     const message = game.messages.get(li.dataset.messageId);
                     return message.system.hasRoll && (game.user.isGM || message.isAuthor);
                 },
-                callback: async li => {
+                onClick: async (_event, li) => {
                     const message = game.messages.get(li.dataset.messageId);
                     const reroll = await message.rolls[0].reroll({ liveRoll: true });
                     message.update({ rolls: [reroll] });
@@ -126,7 +126,7 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
                         : false;
                     return (game.user.isGM || message.isAuthor) && hasRolledDamage;
                 },
-                callback: async li => {
+                onClick: async (_event, li) => {
                     const message = game.messages.get(li.dataset.messageId);
                     const update = await message.system.getRerolledDamage();
                     message.update(update);
diff --git a/module/dice/damageRoll.mjs b/module/dice/damageRoll.mjs
index c5b01438..683d14d8 100644
--- a/module/dice/damageRoll.mjs
+++ b/module/dice/damageRoll.mjs
@@ -51,9 +51,10 @@ export default class DamageRoll extends DHRoll {
         const diceRolls = [];
         if (game.modules.get('dice-so-nice')?.active) {
             config.mute = true;
-            const pool = foundry.dice.terms.PoolTerm.fromRolls(
-                Object.values(config.damage.types)
-            );
+            const pool = foundry.dice.terms.PoolTerm.fromRolls([
+                ...(config.damage.main ? [config.damage.main] : []),
+                ...Object.values(config.damage.resources)
+            ]);
             diceRolls.push(Roll.fromTerms([pool]));
         }
 
diff --git a/module/systemRegistration/migration-handlers/2_5_2.mjs b/module/systemRegistration/migration-handlers/2_5_2.mjs
index 944f0eec..096f4bb7 100644
--- a/module/systemRegistration/migration-handlers/2_5_2.mjs
+++ b/module/systemRegistration/migration-handlers/2_5_2.mjs
@@ -7,7 +7,8 @@ export class Migration_2_5_2 extends MigrationHandlerBase {
     async updateActiveEffectSource(effectSource, item) {
         let shouldUpdate = false;
         const newChanges = [];
-        const srdItem = item?._stats.compendiumSource ? 
+
+        const srdItem = item?._stats?.compendiumSource ? 
             await foundry.utils.fromUuid(item?._stats.compendiumSource) : 
             null;
         for (let i = 0; i < effectSource.system.changes.length; i++) {