diff --git a/src/module/actor/actor.ts b/src/module/actor/actor.ts index 889e8b3..73dff11 100644 --- a/src/module/actor/actor.ts +++ b/src/module/actor/actor.ts @@ -35,6 +35,8 @@ export class DS4Actor extends Actor { } applyActiveEffectsToBaseData(): void { + // reset overrides because our variant of applying active effects does not set them, it only adds overrides + this.overrides = {}; this.applyActiveEffectsFiltered( (change) => !this.derivedDataProperties.includes(change.key) && !this.finalDerivedProperties.includes(change.key), @@ -87,7 +89,7 @@ export class DS4Actor extends Actor { } // Expand the set of final overrides - this.overrides = expandObject({ ...flattenObject(this.overrides ?? {}), ...overrides }); + this.overrides = expandObject({ ...flattenObject(this.overrides), ...overrides }); } protected _getOriginatingItemOfActiveEffect(effect: ActiveEffect): DS4Item | undefined {