From 983f48b415e1a937c357e1fccc41cedbb87cae56 Mon Sep 17 00:00:00 2001 From: WBHarry <89362246+WBHarry@users.noreply.github.com> Date: Mon, 1 Jun 2026 00:03:37 +0200 Subject: [PATCH] Fixed ActiveEffectConfig not opening because NPC was not excluded. Fixed active effects not being appliable to NPCs because they lack system.rules (#1956) --- module/applications/sheets-configs/activeEffectConfig.mjs | 2 +- module/data/fields/action/effectsField.mjs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/applications/sheets-configs/activeEffectConfig.mjs b/module/applications/sheets-configs/activeEffectConfig.mjs index cb9f1701..2d9eafc3 100644 --- a/module/applications/sheets-configs/activeEffectConfig.mjs +++ b/module/applications/sheets-configs/activeEffectConfig.mjs @@ -41,7 +41,7 @@ export default class DhActiveEffectConfig extends foundry.applications.sheets.Ac * @returns {ChangeChoice { value: string, label: string, hint: string, group: string }[]} */ static getChangeChoices() { - const ignoredActorKeys = ['config', 'DhEnvironment', 'DhParty']; + const ignoredActorKeys = ['config', 'DhEnvironment', 'DhParty', 'DhNPC']; const getAllLeaves = (root, group, parentPath = '') => { const leaves = []; diff --git a/module/data/fields/action/effectsField.mjs b/module/data/fields/action/effectsField.mjs index 0d37f5f9..d2ee1682 100644 --- a/module/data/fields/action/effectsField.mjs +++ b/module/data/fields/action/effectsField.mjs @@ -56,7 +56,7 @@ export default class EffectsField extends fields.ArrayField { if (!token) return; const messageToken = token.document ?? token; - const conditionImmunities = messageToken.actor.system.rules.conditionImmunities ?? {}; + const conditionImmunities = messageToken.actor.system.rules?.conditionImmunities ?? {}; messageTargets.push({ token: messageToken, conditionImmunities: Object.values(conditionImmunities).some(x => x)