cache player & unittype

Author: JasperGeurtz

src/main/java/bwapi/EventHandler.java

@@ -48,6 +48,8 @@ public void operation(Client.GameData.Event event) {
                 eventListener.onUnitEvade(game.getUnit(event.v1()));
                 break;
             case 10: // UnitShow
+                game.getUnit(event.v1()).updateType();
+                game.getUnit(event.v1()).updatePlayer();
                 game.unitShow(event.v1());
                 eventListener.onUnitShow(game.getUnit(event.v1()));
                 break;
@@ -64,10 +66,12 @@ public void operation(Client.GameData.Event event) {
                 eventListener.onUnitDestroy(game.getUnit(event.v1()));
                 break;
             case 14: //UnitMorph
+                game.getUnit(event.v1()).updateType();
                 eventListener.onUnitMorph(game.getUnit(event.v1()));
                 break;
             case 15: //UnitRenegade
-                eventListener.onUnitRenegade(game.getUnit((event.v1())));
+                game.getUnit(event.v1()).updatePlayer();
+                eventListener.onUnitRenegade(game.getUnit(event.v1()));
                 break;
             case 16: //SaveGame
                 eventListener.onSaveGame(data.eventString(event.v1()));

src/main/java/bwapi/Unit.java

@@ -32,13 +32,18 @@ public class Unit {
     private final int replayID;
 
     // variable
+    private Player player;
+    private UnitType unitType;
     private int lastCommandFrame = 0;
     private UnitCommand lastCommand;
 
     Unit(final UnitData unitData, final Game game) {
         this.unitData = unitData;
         this.game = game;
 
+        updateType();
+        updatePlayer();
+
         initialType = getType();
         initialResources = getResources();
         initialHitPoints = getHitPoints();
@@ -63,11 +68,11 @@ public int getReplayID() {
     }
 
     public Player getPlayer() {
-        return game.getPlayer(unitData.player());
+        return player;
     }
 
     public UnitType getType() {
-        return UnitType.unitTypes[unitData.type()];
+        return unitType;
     }
 
     public Position getPosition() {
@@ -3928,4 +3933,11 @@ public int hashCode(){
         return getID();
     }
 
+    void updateType() {
+        unitType = UnitType.unitTypes[unitData.type()];
+    }
+
+    void updatePlayer() {
+        player = game.getPlayer(unitData.player());
+    }
 }