1 files changed, 14 insertions, 5 deletions
diff --git a/src/jrummikub/model/GameState.java b/src/jrummikub/model/GameState.java
index 23e51b4..84e206f 100644
--- a/src/jrummikub/model/GameState.java
+++ b/src/jrummikub/model/GameState.java
@@ -6,9 +6,9 @@ import java.util.List;
 
 /** Class managing the overall and momentary GameState */
 public class GameState {
-	ITable table;
-	List<Player> players;
-	int activePlayer;
+	private ITable table;
+	private List<Player> players;
+	private int activePlayer;
 	private StoneHeap gameHeap;
 
 	public GameState() {
@@ -19,18 +19,27 @@ public class GameState {
 		players.add(new Player(Color.green));
 		players.add(new Player(Color.black));
 		activePlayer = 0;
+
 	}
 
 	public ITable getTable() {
 		return table;
 	}
 
+	public int getPlayerCount() {
+		return players.size();
+	}
+
+	public Player getPlayer(int i) {
+		return players.get(i);
+	}
+
 	/** Changes the activePlayer to the next {@link Player} in the list */
 	public void nextPlayer() {
-		activePlayer = (activePlayer + 1) % 4;
+		activePlayer = (activePlayer + 1) % players.size();
 	}
 
-	public Player activePlayer() {
+	public Player getActivePlayer() {
 		return players.get(activePlayer);
 	}