From 0336e4769abbb8a0efb7701f4bfe21afcce0fcc4 Mon Sep 17 00:00:00 2001
From: punchready <marlin.gorsleben@gmail.com>
Date: Thu, 29 Jul 2021 01:01:51 +0200
Subject: [PATCH] fix: include gamestate events in applying to ensure the state
 is set correctly

---
 .../marvelous/gamelibrary/gamelogic/GameStateManager.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameStateManager.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameStateManager.java
index 6023110..2770e3f 100644
--- a/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameStateManager.java
+++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameStateManager.java
@@ -116,19 +116,17 @@ class GameStateManager {
         GameState snapshot = state.snapshot();
 
         ArrayList<Event> result = GameLogic.startGame(snapshot, selectedCharacters1, selectedCharacters2);
-        applyEvents(result);
-
         result.add(GameLogic.buildGameStateEvent(state));
+        applyEvents(result);
 
         snapshot = state.snapshot();
 
         ArrayList<Event> result2 = GameLogic.startRound(snapshot);
+        result.add(GameLogic.buildGameStateEvent(state));
         applyEvents(result2);
 
         result.addAll(result2);
 
-        result.add(GameLogic.buildGameStateEvent(state));
-
         return result;
     }