bwem fixes for sparkle and neoaztec

Author: JasperGeurtz

src/main/java/bwem/Neutral.java

@@ -28,7 +28,7 @@
 public abstract class Neutral {
     private final Unit bwapiUnit;
     private final Position pos;
-    private final TilePosition topLeft;
+    protected TilePosition topLeft;
     private final TilePosition tileSize;
     private final BWMap map;
     private Neutral nextStacked = null;
@@ -143,7 +143,7 @@ public Neutral getLastStacked() {
     }
 
     private boolean isSameUnitTypeAs(Neutral neutral) {
-        return this.getUnit().getClass().getName().equals(neutral.getUnit().getClass().getName());
+        return this.getUnit().getType().equals(neutral.getUnit().getType());
     }
 
     private void putOnTiles() {
@@ -159,6 +159,10 @@ private void putOnTiles() {
                     deltaTile.addNeutral(this);
                 } else {
                     final Neutral topNeutral = deltaTile.getNeutral().getLastStacked();
+                    // https://github.com/N00byEdge/BWEM-community/issues/30#issuecomment-400840140
+                    if (!topNeutral.getTopLeft().equals(getTopLeft()) || !topNeutral.getBottomRight().equals(getBottomRight())) {
+                        continue;
+                    }
                     if (this.equals(deltaTile.getNeutral())) {
                         throw new IllegalStateException();
                     } else if (this.equals(topNeutral)) {
@@ -176,7 +180,7 @@ private void putOnTiles() {
                         //                    bwem_assert_plus(pTop->topLeft() == topLeft(), "stacked neutrals
                         throw new IllegalStateException(
                                 "Stacked Neutral objects not aligned: top="
-                                        + topNeutral.toString()
+                                        + topNeutral.getTopLeft().toString()
                                         + ", this="
                                         + getTopLeft().toString());
                     } else if (!(dx == 0 && dy == 0)) {

src/main/java/bwem/NeutralData.java

@@ -17,6 +17,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static bwapi.UnitType.*;
+
 public final class NeutralData {
     private final List<Mineral> minerals;
     private final List<Geyser> geysers;
@@ -46,16 +48,10 @@ public final class NeutralData {
             if (neutralUnit.getType().isBuilding()) {
                 this.staticBuildings.add(new StaticBuilding(neutralUnit, map));
             }
+            if ( neutralUnit.getType() == Special_Pit_Door || neutralUnit.getType() == Special_Right_Pit_Door) {
+                this.staticBuildings.add(new StaticBuilding(neutralUnit, map));
+            }
         }
-
-        // TODO: Add "Special_Pit_Door" and "Special_Right_Pit_Door" to static buildings list? See
-        // mapImpl.cpp:238.
-        //				if (n->getType() == Special_Pit_Door)
-        //					m_StaticBuildings.push_back(make_unique<StaticBuilding>(n, this));
-        //				if (n->getType() == Special_Right_Pit_Door)
-        //					m_StaticBuildings.push_back(make_unique<StaticBuilding>(n, this));
-
-        ////////////////////////////////////////////////////////////////////////
     }
 
     public List<Mineral> getMinerals() {

src/main/java/bwem/StaticBuilding.java

@@ -12,8 +12,11 @@
 
 package bwem;
 
+import bwapi.TilePosition;
 import bwapi.Unit;
 
+import static bwapi.UnitType.Special_Right_Pit_Door;
+
 /**
  * StaticBuildings Correspond to the units in BWAPI::getStaticNeutralUnits() for which
  * getType().isSpecialBuilding. StaticBuilding also wrappers some special units like
@@ -22,11 +25,10 @@
 public class StaticBuilding extends Neutral {
     StaticBuilding(final Unit unit, final BWMap map) {
         super(unit, map);
-
-        // TODO
-        //        bwem_assert(Type().isSpecialBuilding() ||
-        //                    (Type() == Special_Pit_Door) ||
-        //                    Type() == Special_Right_Pit_Door);
+        // https://github.com/N00byEdge/BWEM-community/blob/cf377c14a6fbad91d6bb4ce6c232a77cb22b500c/BWEM/src/neutral.cpp#L36
+        if (unit.getType() == Special_Right_Pit_Door) {
+            topLeft = topLeft.add(new TilePosition(1, 0));
+        }
     }
 
     @Override
@@ -41,6 +43,7 @@ public boolean equals(final Object object) {
         }
     }
 
+
     @Override
     public int hashCode() {
         return getUnit().hashCode();