From 3ea4f29afdad800c5e55c95fd231865c801f239d Mon Sep 17 00:00:00 2001
From: Johannes Loher <johannes.loher@fg4f.de>
Date: Thu, 19 May 2022 23:47:21 +0200
Subject: [PATCH] fix: fix current tick not being calculated correctly

---
 src/data/documents/combat.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/data/documents/combat.ts b/src/data/documents/combat.ts
index 1ea1e93..1564249 100644
--- a/src/data/documents/combat.ts
+++ b/src/data/documents/combat.ts
@@ -33,7 +33,7 @@ const CombatMixin = (BaseCombat: typeof Combat) => {
      */
     get tickValue(): number {
       const tickValues = this.combatants
-        .filter((combatant) => !combatant.isDefeated)
+        .filter((combatant) => !combatant.isDefeated && !combatant.waiting)
         .map((combatant) => combatant.initiative)
         .filter((tickValue): tickValue is number => tickValue !== null);
       const tickValue = Math.min(...tickValues);