diff --git a/module/applications/hud/tokenHUD.mjs b/module/applications/hud/tokenHUD.mjs index a5a3f490..1492efed 100644 --- a/module/applications/hud/tokenHUD.mjs +++ b/module/applications/hud/tokenHUD.mjs @@ -77,7 +77,7 @@ export default class DHTokenHUD extends foundry.applications.hud.TokenHUD { const animationDuration = 500; const activeTokens = this.actor.system.partyMembers.flatMap(member => member.getActiveTokens()); - const { x: actorX, y: actorY } = this.actor.token; + const { x: actorX, y: actorY } = this.document; if (activeTokens.length > 0) { for (let token of activeTokens) { await token.document.update( diff --git a/module/dice/dhRoll.mjs b/module/dice/dhRoll.mjs index da40696b..c9bda197 100644 --- a/module/dice/dhRoll.mjs +++ b/module/dice/dhRoll.mjs @@ -70,8 +70,10 @@ export default class DHRoll extends Roll { if (Hooks.call(`${CONFIG.DH.id}.postRoll${hook.capitalize()}`, config, message) === false) return null; } - if (config.skips?.createMessage && game.modules.get('dice-so-nice')?.active) { - await game.dice3d.showForRoll(roll, game.user, true); + if (config.skips?.createMessage) { + if (game.modules.get('dice-so-nice')?.active) { + await game.dice3d.showForRoll(roll, game.user, true); + } } else if (!config.source?.message) { config.message = await this.toMessage(roll, config); }