Skip to content

6.1.4 #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ClipplerBlood merged 2 commits into from
Aug 3, 2026
Merged

6.1.4 #323

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd6d225
Ensure only enabled effects are handled in combat tracker
juanferrer Aug 3, 2026
bfefd5b
Merge branch 'Xacus:master' into master
juanferrer Aug 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/module/combat/combat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ export async function _onUpdateWorldTime(worldTime, _delta, _options, _userId) {
// For each actor, select effects that are enabled and have a duration (either rounds or secs)
// const enabledEffects = actor.effects.filter(e => !e.disabled && !e.isSuppressed)
const enabledEffects = actor.effects
const tempEffects = enabledEffects.filter(e => e.duration?.rounds > 0 || e.duration?.seconds > 0)
const tempEffects = enabledEffects.filter(e => (e.duration?.rounds > 0 || e.duration?.seconds > 0) && !e.disabled)
tempEffects.forEach(e => {
const eType = e.flags?.demonlord?.sourceType
const isSpell1Round = eType === 'spell' && e.duration.rounds === 1
Expand Down
Loading