fix dereference warnings

Author: JasperGeurtz

src/main/java/bwem/BWMapInitializer.java

@@ -432,14 +432,15 @@ private List<Pair<WalkPosition, MiniTile>> getSortedMiniTilesByDescendingAltitud
         final List<Pair<WalkPosition, MiniTile>> miniTilesByDescendingAltitude =
                 new ArrayList<>();
 
-        for (int y = 0; y < getData().getMapData().getWalkSize().getY(); ++y)
+        for (int y = 0; y < getData().getMapData().getWalkSize().getY(); ++y) {
             for (int x = 0; x < getData().getMapData().getWalkSize().getX(); ++x) {
                 final WalkPosition w = new WalkPosition(x, y);
                 final MiniTile miniTile = getData().getMiniTile(w, CheckMode.NO_CHECK);
                 if (miniTile.isAreaIdMissing()) {
                     miniTilesByDescendingAltitude.add(new Pair<>(w, miniTile));
                 }
             }
+        }
 
         miniTilesByDescendingAltitude.sort(MiniTile.BY_ALTITUDE_ORDER);
         Collections.reverse(miniTilesByDescendingAltitude);
@@ -593,7 +594,7 @@ private void createAreas(final List<TempAreaInfo> tempAreaList, final int areaMi
     private void setLowestAltitudeInTile(final TilePosition t) {
         Altitude lowestAltitude = new Altitude(Integer.MAX_VALUE);
 
-        for (int dy = 0; dy < 4; ++dy)
+        for (int dy = 0; dy < 4; ++dy) {
             for (int dx = 0; dx < 4; ++dx) {
                 final Altitude altitude =
                         getData()
@@ -605,6 +606,7 @@ private void setLowestAltitudeInTile(final TilePosition t) {
                     lowestAltitude = altitude;
                 }
             }
+        }
 
         getData().getTile(t).setLowestAltitude(lowestAltitude);
     }
@@ -620,14 +622,18 @@ private void setAreaIdAndLowestAltitudeInTiles() {
     }
 
     void onBlockingNeutralDestroyed(Neutral pBlocking) {
-        if (!(pBlocking != null && pBlocking.isBlocking())) {
+        if (pBlocking == null) {
+            throw new IllegalStateException();
+        }
+        if (!pBlocking.isBlocking()) {
             asserter.throwIllegalStateException("");
         }
 
-        for (Area pArea : pBlocking.getBlockedAreas())
+        for (Area pArea : pBlocking.getBlockedAreas()) {
             for (ChokePoint cp : pArea.getChokePoints()) {
                 cp.onBlockingNeutralDestroyed(pBlocking);
             }
+        }
 
         // there remains some blocking Neutrals at the same location
         if (getData().getTile(pBlocking.getTopLeft()).getNeutral() != null) {
@@ -637,22 +643,24 @@ void onBlockingNeutralDestroyed(Neutral pBlocking) {
         // Unblock the miniTiles of pBlocking:
         AreaId newId = pBlocking.getBlockedAreas().iterator().next().getId();
         WalkPosition pBlockingW = pBlocking.getSize().toWalkPosition();
-        for (int dy = 0; dy < pBlockingW.getY(); ++dy)
+        for (int dy = 0; dy < pBlockingW.getY(); ++dy) {
             for (int dx = 0; dx < pBlockingW.getX(); ++dx) {
                 MiniTile miniTile = getData().getMiniTile(
-                                        pBlocking.getTopLeft().toWalkPosition().add(new WalkPosition(dx, dy)));
+                        pBlocking.getTopLeft().toWalkPosition().add(new WalkPosition(dx, dy)));
                 if (miniTile.isWalkable()) {
                     miniTile.replaceBlockedAreaId(newId);
                 }
             }
+        }
 
         // Unblock the Tiles of pBlocking:
-        for (int dy = 0; dy < pBlocking.getSize().getY(); ++dy)
+        for (int dy = 0; dy < pBlocking.getSize().getY(); ++dy) {
             for (int dx = 0; dx < pBlocking.getSize().getX(); ++dx) {
                 getData().getTile(pBlocking.getTopLeft().add(new TilePosition(dx, dy)))
                         .resetAreaId();
                 setAreaIdInTile(pBlocking.getTopLeft().add(new TilePosition(dx, dy)));
             }
+        }
 
         if (automaticPathUpdate()) {
             getGraph().computeChokePointDistanceMatrix();

src/main/java/bwem/ChokePoint.java

@@ -274,7 +274,10 @@ public CPPath getPathTo(final ChokePoint cp) {
     }
 
     void onBlockingNeutralDestroyed(final Neutral pBlocking) {
-        if (!(pBlocking != null && pBlocking.isBlocking())) {
+        if (pBlocking == null) {
+            throw new IllegalStateException();
+        }
+        if (!pBlocking.isBlocking()) {
             graph.getMap().asserter.throwIllegalStateException("");
         }