apply energy difference

Author: JasperGeurtz

src/main/java/bwapi/Unit.java

@@ -337,10 +337,11 @@ public int getShields() {
      * @see UnitType#maxEnergy
      */
     public int getEnergy() {
+        int energy = unitData.getEnergy();
         if (game.isLatComEnabled() && self().energy.valid(game.getFrameCount())) {
-            return self().energy.get();
+            return energy + self().energy.get();
         }
-        return unitData.getEnergy();
+        return energy;
     }
 
     /**

src/main/java/bwapi/UnitSelf.java

@@ -24,7 +24,6 @@ class UnitSelf {
     IntegerCache remainingTrainTime = new IntegerCache();
     UpgradeTypeCache upgrade = new UpgradeTypeCache();
     IntegerCache remainingUpgradeTime = new IntegerCache();
-    IntegerCache energy = new IntegerCache();
     BooleanCache isMoving = new BooleanCache();
     BooleanCache isGathering = new BooleanCache();
     IntegerCache rallyPositionX = new IntegerCache();
@@ -37,6 +36,7 @@ class UnitSelf {
 
     IntegerCache hitPoints = new IntegerCache();
     IntegerCache trainingQueueCount = new IntegerCache();
+    IntegerCache energy = new IntegerCache();
 
 
     UnitSelf() {