Release v1.9.0 (VFTT v10)

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))
+        );
     }
 
     /**

system/scripts/dice/dice-picker-dialog.js

@@ -538,7 +538,9 @@ export class DicePickerDialog extends FormApplication {
             }
 
             if (!this._actor.canDoInitiativeRoll) {
-                ui.notifications.error(game.i18n.localize("l5r5e.conflict.initiative.already_set"));
+                ui.notifications.error(
+                    game.i18n.localize("l5r5e.conflict.initiative.already_set") + ` [${this._actor.name}]`
+                );
                 return this.close();
             }
         }

system/scripts/hooks.js

@@ -313,7 +313,7 @@ export default class HooksL5r5e {
         // In DsN 4.2.1+ the roll is altered in context.
         // So we need to get the original message instead of "context.roll.l5r5e?.history"
         const message = game.messages.get(messageId);
-        if (message?._roll?.l5r5e?.history) {
+        if (message?.rolls?.[0]?.l5r5e?.history) {
             context.blind = true;
         }
     }