diff --git a/src/server/BaseGame.java b/src/server/BaseGame.java index f9eed44..c8a2a14 100644 --- a/src/server/BaseGame.java +++ b/src/server/BaseGame.java @@ -1,8 +1,9 @@ package server; +import java.io.DataInputStream; import java.io.IOException; -import java.io.InputStream; import java.net.Socket; +import java.util.ArrayList; import java.util.List; import card.Card; @@ -57,7 +58,7 @@ BasePlayer[] players; int currentPlayer; - boolean keepRunning; + volatile boolean keepRunning; int port; @@ -75,15 +76,34 @@ flashs = 0; cardsInDeck = N_CARDS; } - - protected abstract void createHistory(); - protected abstract void createUI(); + protected abstract void createHistory(); + protected abstract void createTrash(); + protected void createDeck(){ + deck = new Card[COLORS][5]; + deckCounter = new int[5]; + for (int i=0; i 0; } + + protected void createPlayers() { + players = new BasePlayer[nrOfPlayers]; + for(int i=0; i