diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java index 1af8b6b..8a86e62 100644 --- a/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java +++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java @@ -873,7 +873,7 @@ public class GameLogic { turns.add(id); }else { // send empty turn for knocked out characters result.add(new EventBuilder(EventType.TurnEvent) - .withTurnCount(state.turnOrder.size()) + .withTurnCount(state.turnOrder.indexOf(id) + 1) .withNextCharacter(id) .buildGameEvent()); } @@ -950,7 +950,7 @@ public class GameLogic { break; }else { // again send empty turns for knocked out characters result.add(new EventBuilder(EventType.TurnEvent) - .withTurnCount(state.turnOrder.size()) + .withTurnCount(state.turnOrder.indexOf(id) + 1) .withNextCharacter(id) .buildGameEvent()); } @@ -1127,7 +1127,7 @@ public class GameLogic { ArrayList result = new ArrayList<>(); result.add(new EventBuilder(EventType.TurnEvent) - .withTurnCount(state.turnOrder.size()) + .withTurnCount(state.turnOrder.indexOf(thanos.id) + 1) .withNextCharacter(thanos.id) .buildGameEvent());