GameState#getPlayer -> GameState#getPlayerState

src/main/java/net/royalur/Game.java

@@ -104,14 +104,13 @@ public void addStates(Iterable<GameState> states) {
             seen += 1;
             if (state == null)
                 throw new IllegalArgumentException("The states list should not contain any null entries");
-
-            addState(state);
-
             if (state instanceof ControlGameState && getLastControlState() != null) {
                 throw new IllegalArgumentException(
                         "Only a single control game state per game is currently supported"
                 );
             }
+
+            addState(state);
         }
         if (seen == 0)
             throw new IllegalArgumentException("There were no states to add");
@@ -507,7 +506,7 @@ public PlayerState getDarkPlayer() {
      * @return The state of the player {@code player}.
      */
     public PlayerState getPlayer(PlayerType player) {
-        return getState().getPlayer(player);
+        return getState().getPlayerState(player);
     }
 
     /**

src/main/java/net/royalur/rules/state/EndGameState.java

@@ -84,15 +84,15 @@ public PlayerType getLoser() {
      * @return The state of the player that won the game.
      */
     public PlayerState getWinningPlayer() {
-        return getPlayer(getWinner());
+        return getPlayerState(getWinner());
     }
 
     /**
      * Gets the state of the player that lost the game.
      * @return The state of the player that lost the game.
      */
     public PlayerState getLosingPlayer() {
-        return getPlayer(getLoser());
+        return getPlayerState(getLoser());
     }
 
     @Override

src/main/java/net/royalur/rules/state/GameState.java

@@ -72,7 +72,7 @@ public PlayerState getDarkPlayer() {
      * @param player The player to retrieve the state of.
      * @return The state of the player {@code player}.
      */
-    public PlayerState getPlayer(PlayerType player) {
+    public PlayerState getPlayerState(PlayerType player) {
         return switch (player) {
             case LIGHT -> getLightPlayer();
             case DARK -> getDarkPlayer();

src/main/java/net/royalur/rules/state/OngoingGameState.java

@@ -59,7 +59,7 @@ public PlayerType getWaiting() {
      * @return The state of the player that we are waiting on to interact with the game.
      */
     public PlayerState getTurnPlayer() {
-        return getPlayer(getTurn());
+        return getPlayerState(getTurn());
     }
 
     /**
@@ -69,6 +69,6 @@ public PlayerState getTurnPlayer() {
      *         with the game.
      */
     public PlayerState getWaitingPlayer() {
-        return getPlayer(getWaiting());
+        return getPlayerState(getWaiting());
     }
 }