Release v1.9.0 (VFTT v10)

2022-09-01 22:02:07 +02:00
parent ac5bc5f5b2
commit 49fee9a5dd
8 changed files with 85 additions and 153 deletions
--- a/system/scripts/actor.js
+++ b/system/scripts/actor.js
@@ -283,7 +283,9 @@ export class ActorL5r5e extends Actor {
     * @returns {boolean}
     */
    get canDoInitiativeRoll() {
-        return game.combat?.combatants.some((c) => c.tokenId === this.token?._id && !c.initiative);
+        return game.combat?.combatants.some(
+            (c) => !c.initiative && (c.tokenId === this.token?._id || (!this.token && c.actorId === this._id))
+        );
    }

    /**