actually fix ghost units & fix checking for neutral player

Author: JasperGeurtz

src/main/java/bwapi/EventHandler.java

@@ -46,6 +46,7 @@ public void operation(final Client.GameData.Event event) {
                 eventListener.onSaveGame(data.eventString(event.v1()));
                 break;
             case 8: //UnitDiscover
+                game.unitCreate(event.v1());
                 u = game.getUnit(event.v1());
                 u.updatePosition(frames);
                 u.updateType(frames);
@@ -71,13 +72,15 @@ public void operation(final Client.GameData.Event event) {
                 eventListener.onUnitHide(u);
                 break;
             case 12: //UnitCreate
+                game.unitCreate(event.v1());
                 u = game.getUnit(event.v1());
                 u.updatePosition(frames);
                 u.updateType(frames);
                 u.updatePlayer(frames);
                 eventListener.onUnitCreate(u);
                 break;
             case 13: //UnitDestroy
+                game.unitHide(event.v1());
                 u = game.getUnit(event.v1());
                 eventListener.onUnitDestroy(u);
                 break;
@@ -93,6 +96,7 @@ public void operation(final Client.GameData.Event event) {
                 eventListener.onUnitRenegade(u);
                 break;
             case 17: //UnitComplete
+                game.unitCreate(event.v1());
                 u = game.getUnit(event.v1());
                 u.updatePlayer(frames);
                 eventListener.onUnitComplete(u);

src/main/java/bwapi/Game.java

@@ -151,10 +151,13 @@ void init() {
 
         regionSet = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(regions)));
 
-        units = new Unit[1000];
+        units = new Unit[10000];
         for (int id = 0; id < gameData.getInitialUnitCount(); id++) {
             final Unit unit = new Unit(gameData.getUnit(id), this);
-
+            //skip ghost units
+            if (unit.getInitialType() == UnitType.Terran_Marine && unit.getInitialHitPoints() == 0) {
+                continue;
+            }
             units[id] = unit;
 
             if (unit.getType().isMineralField()) {
@@ -217,16 +220,22 @@ void init() {
         mapPixelHeight = mapHeight * TilePosition.SIZE_IN_PIXELS;
     }
 
-    void unitShow(final int id) {
+    void unitCreate(final int id) {
         if (id > units.length) {
             //rescale unit array if needed
             final Unit[] largerUnitsArray = new Unit[2 * units.length];
             System.arraycopy(units, 0, largerUnitsArray, 0, units.length);
             units = largerUnitsArray;
         }
+
         if (units[id] == null) {
-            units[id] = new Unit(gameData.getUnit(id), this);
+            final Unit u = new Unit(gameData.getUnit(id), this);
+            units[id] = u;
         }
+    }
+
+    void unitShow(final int id) {
+        unitCreate(id);
         visibleUnits.add(id);
     }
 

src/main/java/bwapi/Player.java

@@ -16,19 +16,16 @@ public class Player {
     private final Race race;
     private final PlayerType playerType;
     private final Force force;
-    private final boolean neutral;
     private final TilePosition startLocation;
 
     Player(final Client.GameData.PlayerData playerData, final Game game) {
         this.playerData = playerData;
         this.game = game;
-
         this.id = playerData.id();
         this.name = playerData.name();
         this.race = Race.races[playerData.race()];
         this.playerType = PlayerType.playerTypes[playerData.type()];
         this.force = game.getForce(playerData.force());
-        this.neutral = equals(game.neutral());
         this.startLocation = new TilePosition(playerData.startLocationX(), playerData.startLocationY());
     }
 
@@ -68,7 +65,7 @@ public boolean isEnemy(final Player player) {
     }
 
     public boolean isNeutral() {
-        return neutral;
+        return  equals(game.neutral());
     }
 
     public TilePosition getStartLocation() {