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

Author: TheApplePieGod

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

@@ -34,7 +34,7 @@ public class GameConstants {
     public static final int MAX_WALL_PERCENTAGE = 20;
 
     /** The 32 bit representation of the special resource pattern. */
-    public static final int RESOURCE_PATTERN = 22369621; 
+    public static final int RESOURCE_PATTERN = 22365525; 
 
     /** The 32 bit representation of the paint tower pattern. */
     public static final int PAINT_TOWER_PATTERN = 18157905;

engine/src/main/battlecode/server/GameMaker.java

@@ -468,7 +468,7 @@ public void endRound(){
 
                 Round.addTeamIds(builder, teamIDsP);
                 Round.addTeamCoverageAmounts(builder, teamCoverageAmountsP);
-                Round.addTeamResourceAmounts(builder, teamResourcePatternAmountsP);
+                Round.addTeamResourcePatternAmounts(builder, teamResourcePatternAmountsP);
                 Round.addRoundId(builder, this.currentRound);
                 Round.addTeamResourceAmounts(builder, teamMoneyAmountsP);
                 Round.addDiedIds(builder, diedIdsP);