From cb998860d91cad3fa4d295677b78606ca156116c Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Sat, 24 Jan 2026 20:19:16 +0100
Subject: [PATCH] Spellcastmodifiers were not being sorted correctly for use
 (#1578)

---
 module/data/actor/character.mjs               | 2 +-
 templates/sheets/actors/character/sidebar.hbs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs
index 12396384..47660da4 100644
--- a/module/data/actor/character.mjs
+++ b/module/data/actor/character.mjs
@@ -368,7 +368,7 @@ export default class DhCharacter extends BaseDataActor {
         const modifiers = subClasses
             ?.map(sc => ({ ...this.traits[sc.system.spellcastingTrait], key: sc.system.spellcastingTrait }))
             .filter(x => x);
-        return modifiers.sort((a, b) => a.value - b.value)[0];
+        return modifiers.sort((a, b) => (b.value ?? 0) - (a.value ?? 0))[0];
     }
 
     get spellcastModifier() {
diff --git a/templates/sheets/actors/character/sidebar.hbs b/templates/sheets/actors/character/sidebar.hbs
index 0db2bf42..24e68e02 100644
--- a/templates/sheets/actors/character/sidebar.hbs
+++ b/templates/sheets/actors/character/sidebar.hbs
@@ -1,12 +1,12 @@
 <aside class="character-sidebar-sheet">
     <div class="portrait {{#if isDeath}}death-roll{{/if}}">
         <img src="{{document.img}}" alt="{{document.name}}" data-action='editImage' data-edit="img">
-        {{#if document.system.class.subclass.system.spellcastingTrait}}
+        {{#if document.system.spellcastModifierTrait.key}}
             <div class="icons-list">
                 <span class="spellcast-icon {{#if isDeath}}no-label{{/if}}">
                     <span class="spellcast-label">
                         {{localize "DAGGERHEART.ITEMS.Subclass.spellcastingTrait"}}: 
-                        {{localize (concat 'DAGGERHEART.CONFIG.Traits.' document.system.class.subclass.system.spellcastingTrait '.short')}}
+                        {{localize (concat 'DAGGERHEART.CONFIG.Traits.' document.system.spellcastModifierTrait.key '.short')}}
                     </span>
                     <i class="fa-solid fa-wand-sparkles"></i>
                 </span>