diff --git a/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java index d3c9e9e..386aadd 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java +++ b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java @@ -24,6 +24,8 @@ public class RoboRallyGame implements IDrawableGame { private List> conveyorBelts; private List> fastConveyorBelts; private List playerList; + private List> blacklistedTiles = new ArrayList<>(); + private List> whitelistedTiles = new ArrayList<>(); public RoboRallyGame(boolean debug) { if (debug) { @@ -306,10 +308,6 @@ public class RoboRallyGame implements IDrawableGame { } } - - private List> blacklistedTiles = new ArrayList<>(); - private List> whitelistedTiles = new ArrayList<>(); - /** * Finds conveyor belts that can move without conflict * @param conveyorBelts that should be checked @@ -328,6 +326,7 @@ public class RoboRallyGame implements IDrawableGame { } } + List> listOfRow = new ArrayList<>(); for (BoardElementContainer conveyorBeltWithRobot : conveyorBeltsWithRobotsOn) { if (blacklistedTiles.contains(conveyorBeltWithRobot) || whitelistedTiles.contains((conveyorBeltWithRobot))) { @@ -335,7 +334,7 @@ public class RoboRallyGame implements IDrawableGame { } BoardElementContainer lastInRow = findLastRobotInRow (conveyorBeltWithRobot, conveyorBeltsWithRobotsOn); - List> listOfRow = new ArrayList<>(); + List> results = findFirstRobotInRow(lastInRow, conveyorBeltsWithRobotsOn, listOfRow);