From 13730dd5921bcd1a6d97981207a1d2f7b4aaf480 Mon Sep 17 00:00:00 2001
From: Tobydrama <Tobe-madsen@hotmail.no>
Date: Mon, 20 Apr 2020 18:49:50 +0200
Subject: [PATCH] added check to stop nullpointexception

---
 src/main/java/inf112/fiasko/roborally/objects/Board.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/inf112/fiasko/roborally/objects/Board.java b/src/main/java/inf112/fiasko/roborally/objects/Board.java
index ddd53d1..38c2679 100644
--- a/src/main/java/inf112/fiasko/roborally/objects/Board.java
+++ b/src/main/java/inf112/fiasko/roborally/objects/Board.java
@@ -167,7 +167,7 @@ public class Board {
         if(robots.containsKey(robotID)){
             robots.get(robotID).setPowerDown(powerDown);
         }
-        else {
+        else if (getRobotFromDeadRobots(robotID)!=null) {
             getRobotFromDeadRobots(robotID).setPowerDown(powerDown);
         }
     }
@@ -184,9 +184,10 @@ public class Board {
         if(robots.containsKey(robotID)){
             return robots.get(robotID).isInPowerDown();
         }
-        else {
+        else if (getRobotFromDeadRobots(robotID)!=null){
             return  getRobotFromDeadRobots(robotID).isInPowerDown();
         }
+        return false;
     }
     private Robot getRobotFromDeadRobots(RobotID robotID){
         for (Robot robot:deadRobots) {