From db4981f166bed295ada768571d9e6648fd9db675 Mon Sep 17 00:00:00 2001
From: pjreiniger <pj.reiniger@gmail.com>
Date: Sat, 23 Sep 2017 10:56:53 -0400
Subject: [PATCH] Java now asks the HAL if it is a simulation or not (#647)

---
 wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java
index eb7c752ea8..dfe619157c 100644
--- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java
+++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java
@@ -20,6 +20,7 @@ import edu.wpi.first.networktables.NetworkTableInstance;
 import edu.wpi.first.wpilibj.hal.FRCNetComm.tInstances;
 import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType;
 import edu.wpi.first.wpilibj.hal.HAL;
+import edu.wpi.first.wpilibj.hal.HALUtil;
 import edu.wpi.first.wpilibj.internal.HardwareHLUsageReporting;
 import edu.wpi.first.wpilibj.internal.HardwareTimer;
 import edu.wpi.first.wpilibj.livewindow.LiveWindow;
@@ -77,7 +78,7 @@ public abstract class RobotBase {
    * @return If the robot is running in simulation.
    */
   public static boolean isSimulation() {
-    return false;
+    return !isReal();
   }
 
   /**
@@ -86,7 +87,7 @@ public abstract class RobotBase {
    * @return If the robot is running in the real world.
    */
   public static boolean isReal() {
-    return true;
+    return HALUtil.getHALRuntimeType() == 0;
   }
 
   /**