From a944e869610b74b4e5333a93f8d2d75d75c4353e Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Fri, 15 Aug 2025 21:50:02 +0200
Subject: [PATCH] Improved to properly handle theoretical additional damage
 parts

---
 module/dice/damageRoll.mjs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/module/dice/damageRoll.mjs b/module/dice/damageRoll.mjs
index c3ac6fda..427b6273 100644
--- a/module/dice/damageRoll.mjs
+++ b/module/dice/damageRoll.mjs
@@ -318,17 +318,19 @@ export default class DamageRoll extends DHRoll {
         });
 
         const updateMessage = game.messages.get(message._id);
+        const damageParts = updateMessage.system.damage[damageType].parts.map((damagePart, index) => {
+            if (index !== Number(part)) return damagePart;
+            return {
+                ...rollPart,
+                total: parsedRoll.total,
+                dice: rerolledDice
+            };
+        });
         await updateMessage.update({
             [`system.damage.${damageType}`]: {
                 ...updateMessage,
                 total: parsedRoll.total,
-                parts: [
-                    {
-                        ...rollPart,
-                        total: parsedRoll.total,
-                        dice: rerolledDice
-                    }
-                ]
+                parts: damageParts
             }
         });
     }