Restored existing (sync) behavior.

Author: dgant

src/main/java/bwapi/BWClient.java

@@ -50,19 +50,28 @@ public void startGame(BWClientConfiguration configuration) {
         handler = new EventHandler(eventListener, client);
 
         do {
+            BotWrapper botWrapper;
             while (!getGame().isInGame()) {
                 if (!client.isConnected()) {
                     return;
                 }
                 client.update();
             }
+            botWrapper = new BotWrapper(configuration, client.mapFile(), client.gameData(), handler);
+            botWrapper.step();
             while (getGame().isInGame()) {
                 client.update();
+                botWrapper.step();
                 if (!client.isConnected()) {
                     System.out.println("Reconnecting...");
                     client.reconnect();
                 }
             }
+
+            // TODO: Before exiting give async bot time to complete onEnd().
+
         } while (configuration.autoContinue); // lgtm [java/constant-loop-condition]
+
+
     }
 }

src/main/java/bwapi/BWClientConfiguration.java

@@ -22,7 +22,7 @@ public class BWClientConfiguration {
      * and some tournaments enforce frame-wise time limits (at time of writing, 55ms for COG and AIIDE; 85ms for SSCAIT).
      *
      * Asynchronous mode invokes bot event handlers in a separate thread, and if all event handlers haven't returned by a specified period of time, sends an
-     * returns control to StarCraft, allowing the game to proceed while the bot continues to run in the background. This increases the likelihood of meeting
+     * returns control to StarCraft, allowing the game to proceed while the bot continues to step in the background. This increases the likelihood of meeting
      * real-time performance requirements, while not fully guaranteeing it (subject to the whims of the JVM thread scheduler), at a cost of the bot possibly
      * issuing commands later than intended, and a marginally larger memory footprint.
      */

src/main/java/bwapi/BotWrapper.java

@@ -31,32 +31,35 @@ of this software and associated documentation files (the "Software"), to deal
  * Manages invocation of bot event handlers
  */
 public class BotWrapper {
-    private EventHandler eventHandler;
-    private ByteBuffer sharedMemory;
     private BWClientConfiguration configuration;
-
+    private ByteBuffer sharedMemory;
+    private ClientData.GameData gameData;
+    private EventHandler eventHandler;
     private FrameBuffer frameBuffer;
 
-    public BotWrapper(ByteBuffer sharedMemory, EventHandler eventHandler, BWClientConfiguration configuration) {
+    public BotWrapper(
+            BWClientConfiguration configuration,
+            ByteBuffer sharedMemory,
+            ClientData.GameData gameData,
+            EventHandler eventHandler) {
+        this.configuration = configuration;
         this.sharedMemory = sharedMemory;
+        this.gameData = gameData;
         this.eventHandler = eventHandler;
-        this.configuration = configuration;
 
         if (configuration.async) {
             frameBuffer = new FrameBuffer(configuration.asyncFrameBufferSize);
         }
     }
 
-    public void run() {
+    public void step() {
         if (configuration.async) {
             // TODO: Synchronize
             frameBuffer.enqueueFrame();
         } else {
-            /*
             for (int i = 0; i < gameData.getEventCount(); i++) {
                 eventHandler.operation(gameData.getEvents(i));
             }
-            */
         }
     }
 }

src/main/java/bwapi/Client.java

@@ -78,6 +78,10 @@ GameData gameData() {
         return gameData;
     }
 
+    ByteBuffer mapFile() {
+        return mapFileHandle;
+    }
+
     boolean isConnected() {
         return connected;
     }

src/main/java/bwapi/Game.java

@@ -2244,7 +2244,7 @@ public int getAPM(final boolean includeSelects) {
 
     /**
      * Sets the number of graphical frames for every logical frame. This
-     * allows the game to run more logical frames per graphical frame, increasing the speed at
+     * allows the game to step more logical frames per graphical frame, increasing the speed at
      * which the game runs.
      *
      * @param frameSkip Number of graphical frames per logical frame. If this value is 0 or less, then it will default to 1.

src/main/java/bwapi/Unit.java

@@ -1019,7 +1019,7 @@ public Order getOrder() {
 
     /**
      * Retrieves the secondary Order that the unit is assigned. Secondary
-     * orders are run in the background as a sub-order. An example would be {@link Order#TrainFighter},
+     * orders are step in the background as a sub-order. An example would be {@link Order#TrainFighter},
      * because a @Carrier can move and train fighters at the same time.
      *
      * @return The secondary {@link Order} that the unit is executing.