Merge branch 'develop' of https://github.com/JavaBWAPI/JBWAPI into develop

Author: JasperGeurtz

src/main/java/bwapi/Player.java

@@ -23,9 +23,7 @@ public class Player implements Comparable<Player> {
     private final Game game;
     private final int id;
     private final String name;
-    private final Race race;
     private final PlayerType playerType;
-    private final Force force;
     private final TilePosition startLocation;
 
     private PlayerSelf self = null;
@@ -41,9 +39,7 @@ PlayerSelf self() {
         this.game = game;
         this.id = id;
         this.name = playerData.getName();
-        this.race = Race.idToEnum[playerData.getRace()];
         this.playerType = PlayerType.idToEnum[playerData.getType()];
-        this.force = game.getForce(playerData.getForce());
         this.startLocation = new TilePosition(playerData.getStartLocationX(), playerData.getStartLocationY());
     }
 
@@ -88,7 +84,7 @@ public List<Unit> getUnits() {
      * have not been seen.
      */
     public Race getRace() {
-        return race;
+        return Race.idToEnum[playerData.getRace()];
     }
 
     /**
@@ -110,7 +106,7 @@ public PlayerType getType() {
      * @return The {@link Force} object that the player is part of.
      */
     public Force getForce() {
-        return force;
+        return game.getForce(playerData.getForce());
     }
 
     /**