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 aa81646..c4801f8 100644 --- a/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java +++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java @@ -768,13 +768,10 @@ public class GameLogic { * @param state The game state to work on * @param selectedCharacters1 The characters selected by player 1 * @param selectedCharacters2 The characters selected by player 2 - * @return The list of resulting {@link Event Events} */ - protected static ArrayList startGame(GameState state, List selectedCharacters1, List selectedCharacters2) { + protected static void startGame(GameState state, List selectedCharacters1, List selectedCharacters2) { Logger.trace("Starting game"); - ArrayList result = new ArrayList<>(); - ArrayList free = new ArrayList<>(); int rockIndex = 0; @@ -818,8 +815,6 @@ public class GameLogic { state.turnOrder.add(id); } - - return result; } /** 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 2770e3f..861fb34 100644 --- a/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameStateManager.java +++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameStateManager.java @@ -115,16 +115,16 @@ class GameStateManager { public List startGame(List selectedCharacters1, List selectedCharacters2) { GameState snapshot = state.snapshot(); - ArrayList result = GameLogic.startGame(snapshot, selectedCharacters1, selectedCharacters2); - result.add(GameLogic.buildGameStateEvent(state)); - applyEvents(result); + GameLogic.startGame(snapshot, selectedCharacters1, selectedCharacters2); + applyEvent(GameLogic.buildGameStateEvent(snapshot)); snapshot = state.snapshot(); ArrayList result2 = GameLogic.startRound(snapshot); - result.add(GameLogic.buildGameStateEvent(state)); applyEvents(result2); + ArrayList result = new ArrayList<>(); + result.add(GameLogic.buildGameStateEvent(snapshot)); result.addAll(result2); return result;