Merge branch 'main' into feature/chat-message-styles

This commit is contained in:
Dapoolp 2025-08-02 03:17:27 +02:00
commit 0cfcec121b
27 changed files with 1717 additions and 185 deletions

View file

@ -641,7 +641,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
await item.update({ 'system.equipped': true });
break;
case 'weapon':
if (this.document.effects.find(x => x.type === 'beastform')) {
if (this.document.effects.find(x => !x.disabled && x.type === 'beastform')) {
return ui.notifications.warn(
game.i18n.localize('DAGGERHEART.UI.Notifications.beastformEquipWeapon')
);