From 045d28d9ab8cc142cd9c03e400d14bced4d6f74b Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sun, 28 Nov 2021 18:34:41 +0100 Subject: [PATCH] Fix: regression combat --- module/rdd-combat.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/module/rdd-combat.js b/module/rdd-combat.js index 6826fcf6..107b9a52 100644 --- a/module/rdd-combat.js +++ b/module/rdd-combat.js @@ -422,7 +422,7 @@ export class RdDCombat { /* -------------------------------------------- */ static combatNouveauTour(combat) { - if (Misc.isUniqueSingleUser()) { + if (Misc.isUniqueConnectedGM()) { let turn = combat.turns.find(t => t.token?.id == combat.current.tokenId); if (turn?.actor) { RdDCombat.displayActorCombatStatus(combat, turn.actor); @@ -540,7 +540,7 @@ export class RdDCombat { /* -------------------------------------------- */ static onMsgEncaisser(data) { - if (Misc.isUniqueSingleUser()) { + if (Misc.isUniqueConnectedGM()) { let attackerRoll = RdDCombat._getAttaque(data.attackerId); // Retrieve the rolldata from the store let attacker = data.attackerId ? game.actors.get(data.attackerId) : null; let defender = canvas.tokens.get(data.defenderTokenId).actor; @@ -555,7 +555,7 @@ export class RdDCombat { /* -------------------------------------------- */ static onMsgDefense(msg) { let defenderToken = canvas.tokens.get(msg.defenderTokenId); - if (defenderToken && Misc.isUniqueSingleUser()) { + if (defenderToken && Misc.isUniqueConnectedGM()) { const rddCombat = RdDCombat.createForAttackerAndDefender(msg.attackerId, msg.defenderTokenId); if (rddCombat) { const defenderRoll = msg.defenderRoll; @@ -913,7 +913,7 @@ export class RdDCombat { dmg: attackerRoll.dmg, }; - if (!Misc.isUniqueSingleUser()) { + if (!Misc.isUniqueConnectedGM()) { this._socketSendMessageDefense(paramChatDefense, defenderRoll); } else { @@ -1286,7 +1286,7 @@ export class RdDCombat { this._onEchecTotal(defenderRoll); } - if (Misc.isUniqueSingleUser()) { + if (Misc.isUniqueConnectedGM()) { attackerRoll.attackerId = this.attackerId; attackerRoll.defenderTokenId = defenderTokenId;