Merge remote-tracking branch 'origin/engine' into client

Author: TheApplePieGod

engine/src/main/battlecode/common/UnitType.java

@@ -13,9 +13,9 @@ public enum UnitType {
     LEVEL_TWO_MONEY_TOWER(0, 250,  0, 1500, 2, 1000, 10, 9, 20, 10, 0, 15),
     LEVEL_THREE_MONEY_TOWER(0, 500, 0, 2000, 3, 1000, 10, 9, 20, 10, 0, 20),
 
-    LEVEL_ONE_DEFENSE_TOWER(0, 25,  0, 2500, 1, 1000, 10, 25, 60, 30, 0, 0),
-    LEVEL_TWO_DEFENSE_TOWER(0, 250,  0, 3000, 2, 1000, 10, 25, 65, 35, 0, 0),
-    LEVEL_THREE_DEFENSE_TOWER(0, 500, 0, 3500, 3, 1000, 10, 25, 70, 40, 0, 0);
+    LEVEL_ONE_DEFENSE_TOWER(0, 25,  0, 2500, 1, 1000, 10, 20, 60, 30, 0, 0),
+    LEVEL_TWO_DEFENSE_TOWER(0, 250,  0, 3000, 2, 1000, 10, 20, 65, 35, 0, 0),
+    LEVEL_THREE_DEFENSE_TOWER(0, 500, 0, 3500, 3, 1000, 10, 20, 70, 40, 0, 0);
 
 
     // the paint cost to build the unit

engine/src/main/battlecode/world/GameWorld.java

@@ -187,15 +187,19 @@ private void updateDynamicBodies() {
     }
 
     private void updateResourcePatterns() {
+        ArrayList<MapLocation> newResourcePatternCenters = new ArrayList<>();
         for (MapLocation center : resourcePatternCenters) {
             Team team = resourcePatternCentersByLoc[locationToIndex(center)];
             boolean stillActive = checkResourcePattern(team, center);
 
             if (!stillActive) {
-                resourcePatternCenters.remove(center);
                 resourcePatternCentersByLoc[locationToIndex(center)] = Team.NEUTRAL;
             }
+            else{
+                newResourcePatternCenters.add(center);
+            }
         }
+        this.resourcePatternCenters = newResourcePatternCenters;
     }
 
     public int getResourcePatternBit(int dx, int dy) {
@@ -241,7 +245,6 @@ public boolean checkPattern(int pattern, Team team, MapLocation center, boolean
         // boolean[] possibleSymmetries = new boolean[8];
         // for (int i = 0; i < 8; i++) possibleSymmetries[i] = true;
         // int numRemainingSymmetries = 8;
-
         for (int dx = -GameConstants.PATTERN_SIZE / 2; dx < (GameConstants.PATTERN_SIZE + 1) / 2; dx++) {
             for (int dy = -GameConstants.PATTERN_SIZE / 2; dy < (GameConstants.PATTERN_SIZE + 1) / 2; dy++) {
                 // ignore checking paint for center ruin location