diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java index e145f72..48f059d 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java +++ b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java @@ -95,9 +95,12 @@ public class CardChoiceScreen extends InputAdapter implements Screen { List oldProgram = roboRallyWrapper.roboRallyGame.getProgram(); int lockedCardsInt = 5-maxCards; List newProgram = getCards(); - for(int i = 5; i>(5-lockedCardsInt);i--){ + for(int i = 4; i>(4-lockedCardsInt);i--){ newProgram.add(oldProgram.get(i)); } + System.out.println("fuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuasdasdasda234234234: "+newProgram.size()); + System.out.println(newProgram); + roboRallyWrapper.roboRallyGame.setProgram(newProgram); roboRallyWrapper.roboRallyGame.setGameState(GameState.CHOOSING_POWER_DOWN); roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getPowerDownScreen(roboRallyWrapper)); diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/LoadingScreen.java b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/LoadingScreen.java index 3c8a526..8ce4c9c 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/LoadingScreen.java +++ b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/LoadingScreen.java @@ -46,6 +46,7 @@ public class LoadingScreen extends AbstractScreen { if (roboRallyWrapper.roboRallyGame != null) { GameState gameState = roboRallyWrapper.roboRallyGame.getGameState(); + System.out.println(gameState); if (gameState != GameState.LOADING) { handleScreenChange(gameState); } diff --git a/src/main/java/inf112/fiasko/roborally/networking/RoboRallyServerListener.java b/src/main/java/inf112/fiasko/roborally/networking/RoboRallyServerListener.java index b34ff8d..88ba4ba 100644 --- a/src/main/java/inf112/fiasko/roborally/networking/RoboRallyServerListener.java +++ b/src/main/java/inf112/fiasko/roborally/networking/RoboRallyServerListener.java @@ -110,7 +110,9 @@ class RoboRallyServerListener extends Listener { */ private void receiveContinuePowerDown(Connection connection, Boolean bool) { stayInPowerDown.put(connection, bool); + System.out.println("fuuuuuuuuuuuuuuuuu"); if (receivedDataFromAllConnections(stayInPowerDown)) { + System.out.println("fuuuuuuuuuuuuuuuuasdasdasdasdasdasdasdu"); Map powerDowns = new HashMap<>(); for (Connection connected : stayInPowerDown.keySet()) { powerDowns.put(playerNames.get(connected), stayInPowerDown.get(connected)); @@ -149,8 +151,11 @@ class RoboRallyServerListener extends Listener { */ private boolean receivedDataFromAllConnections(Map data) { Set connections = clients.keySet(); + System.out.println("keys "+data.keySet()); + System.out.println(connections); connections.removeAll(deadPlayers); - return connections.containsAll(data.keySet()) && data.keySet().containsAll(connections); + System.out.println(connections); + return data.keySet().containsAll(connections); } @Override