Don't cache unittype & player anymore, using Unsafe makes this much faster, position is probably still worth to cache

Author: JasperGeurtz

src/main/java/bwapi/EventHandler.java

@@ -6,7 +6,7 @@ class EventHandler implements Client.EventHandler {
     private final Game game;
     private final Client client;
 
-    public EventHandler(final BWEventListener eventListener, final Client client) {
+    EventHandler(final BWEventListener eventListener, final Client client) {
         this.eventListener = eventListener;
         this.game = new Game(client);
         this.client = client;
@@ -49,8 +49,6 @@ public void operation(final ClientData.Event event) {
                 game.unitCreate(event.getV1());
                 u = game.getUnit(event.getV1());
                 u.updatePosition(frames);
-                u.updateType(frames);
-                u.updatePlayer(frames);
                 eventListener.onUnitDiscover(u);
                 break;
             case UnitEvade:
@@ -62,8 +60,6 @@ public void operation(final ClientData.Event event) {
                 game.unitShow(event.getV1());
                 u = game.getUnit(event.getV1());
                 u.updatePosition(frames);
-                u.updateType(frames);
-                u.updatePlayer(frames);
                 eventListener.onUnitShow(u);
                 break;
             case UnitHide:
@@ -75,8 +71,6 @@ public void operation(final ClientData.Event event) {
                 game.unitCreate(event.getV1());
                 u = game.getUnit(event.getV1());
                 u.updatePosition(frames);
-                u.updateType(frames);
-                u.updatePlayer(frames);
                 eventListener.onUnitCreate(u);
                 break;
             case UnitDestroy:
@@ -87,19 +81,15 @@ public void operation(final ClientData.Event event) {
             case UnitMorph:
                 u = game.getUnit(event.getV1());
                 u.updatePosition(frames);
-                u.updateType(frames);
-                u.updatePlayer(frames);
                 eventListener.onUnitMorph(u);
                 break;
             case UnitRenegade:
                 u = game.getUnit(event.getV1());
-                u.updatePlayer(frames);
                 eventListener.onUnitRenegade(u);
                 break;
             case UnitComplete:
                 game.unitCreate(event.getV1());
                 u = game.getUnit(event.getV1());
-                u.updatePlayer(frames);
                 eventListener.onUnitComplete(u);
                 break;
         }

src/main/java/bwapi/Unit.java

@@ -28,12 +28,8 @@ public class Unit implements Comparable<Unit>{
     private final int id;
     private final int replayID;
     // variable
-    private Player player;
-    private UnitType unitType;
     private Position position;
     private int lastPositionUpdate = -1;
-    private int lastTypeUpdate = -1;
-    private int lastPlayerUpdate = -1;
     private int lastCommandFrame;
     private UnitCommand lastCommand;
 
@@ -42,8 +38,6 @@ public class Unit implements Comparable<Unit>{
         this.unitData = unitData;
         this.game = game;
 
-        updateType(0);
-        updatePlayer(0);
         updatePosition(0);
 
         initialType = getType();
@@ -79,11 +73,11 @@ public int getReplayID() {
     }
 
     public Player getPlayer() {
-        return player;
+        return game.getPlayer(unitData.getPlayer());
     }
 
     public UnitType getType() {
-        return unitType;
+        return UnitType.idToEnum[unitData.getType()];
     }
 
     public Position getPosition() {
@@ -4120,20 +4114,6 @@ public int compareTo(final Unit other) {
         return getID() - other.getID();
     }
 
-    void updateType(final int frame) {
-        if (frame > lastTypeUpdate) {
-            lastTypeUpdate = frame;
-            unitType = UnitType.idToEnum[unitData.getType()];
-        }
-    }
-
-    void updatePlayer(final int frame) {
-        if (frame > lastPlayerUpdate) {
-            lastPlayerUpdate = frame;
-            player = game.getPlayer(unitData.getPlayer());
-        }
-    }
-
     void updatePosition(final int frame) {
         if (frame > lastPositionUpdate) {
             lastPositionUpdate = frame;