EpicKnarvik97/Fiasko
EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2025-01-31 23:29:36 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/inf112-v20/Fiasko

Browse Source
This commit is contained in:
Kristian Knarvik 2020-02-26 20:54:22 +01:00
commit 2b12f6d954
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/inf112/fiasko/roborally/objects/Board.java
View File

@ -304,10 +304,9 @@ public class Board {
robot.setFacingDirection(Direction.NORTH); robot.setFacingDirection(Direction.NORTH);
robots.put(robot.getRobotId(), robot); robots.put(robot.getRobotId(), robot);
} }
else { else {deadRobots.remove(robot); }
deadRobots.remove(robot);
}
} }
deadRobots = new ArrayList<>();
} }
/** /**

3
src/test/java/inf112/fiasko/roborally/objects/BoardTest.java
View File

@ -132,7 +132,8 @@ public class BoardTest {
@Test @Test
public void respawnRobotAtBackupPosition() { public void respawnRobotAtBackupPosition() {
Robot robot = board.getAliveRobots().get(0); Robot robot = robotList.get(0);
robot.setPosition(new Position(0, 0));
board.moveRobot(robot.getRobotId(), Direction.NORTH); board.moveRobot(robot.getRobotId(), Direction.NORTH);
board.removeDeadRobotFromBoard(robot); board.removeDeadRobotFromBoard(robot);
board.respawnRobots(); board.respawnRobots();