EpicKnarvik97/Fiasko
EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2024-10-16 18:23:38 +02:00
Code Issues Projects Releases Wiki Activity

added check to stop nullpointexception

Browse Source
This commit is contained in:
Tobydrama 2020-04-20 18:49:50 +02:00
parent 4fe0439297
commit 13730dd592
1 changed files with 3 additions and 2 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

@ -167,7 +167,7 @@ public class Board {
if(robots.containsKey(robotID)){ if(robots.containsKey(robotID)){
robots.get(robotID).setPowerDown(powerDown); robots.get(robotID).setPowerDown(powerDown);
} }
else { else if (getRobotFromDeadRobots(robotID)!=null) {
getRobotFromDeadRobots(robotID).setPowerDown(powerDown); getRobotFromDeadRobots(robotID).setPowerDown(powerDown);
} }
} }
@ -184,9 +184,10 @@ public class Board {
if(robots.containsKey(robotID)){ if(robots.containsKey(robotID)){
return robots.get(robotID).isInPowerDown(); return robots.get(robotID).isInPowerDown();
} }
else { else if (getRobotFromDeadRobots(robotID)!=null){
return getRobotFromDeadRobots(robotID).isInPowerDown(); return getRobotFromDeadRobots(robotID).isInPowerDown();
} }
return false;
} }
private Robot getRobotFromDeadRobots(RobotID robotID){ private Robot getRobotFromDeadRobots(RobotID robotID){
for (Robot robot:deadRobots) { for (Robot robot:deadRobots) {