EpicKnarvik97/Fiasko
EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2025-05-04 01:16:25 +02: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
src
main/java/inf112/fiasko/roborally/objects
Board.java
test/java/inf112/fiasko/roborally/objects
BoardTest.java

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

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

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

@ -132,7 +132,8 @@ public class BoardTest {
@Test
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.removeDeadRobotFromBoard(robot);
board.respawnRobots();