Merge pull request #5545 from SJuliez/missing-round-increase

Fix seemingly incorrect round counter handling
MegaMek · Jun 6, 2024 · cdba4d8 · cdba4d8
2 parents 5c2689d + 383ed35
commit cdba4d8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/megamek/src/megamek/common/AbstractGame.java b/megamek/src/megamek/common/AbstractGame.java
@@ -71,7 +71,10 @@ public abstract class AbstractGame implements IGame {
      */
     private final Map<Integer, List<Deployable>> deploymentTable = new HashMap<>();
 
-    protected int currentRound = 0;
+    /**
+     * The round counter. It gets incremented before initiative; round 0 is initial deployment only.
+     */
+    protected int currentRound = -1;
 
     @Override
     public Forces getForces() {

diff --git a/megamek/src/megamek/common/Game.java b/megamek/src/megamek/common/Game.java
@@ -1319,7 +1319,7 @@ public void removeEntities(List<Integer> ids, int condition) {
     public synchronized void reset() {
         uuid = UUID.randomUUID();
 
-        currentRound = 0;
+        currentRound = -1;
 
         inGameObjects.clear();
         entityPosLookup.clear();

diff --git a/megamek/src/megamek/server/GameManager.java b/megamek/src/megamek/server/GameManager.java
@@ -1865,10 +1865,8 @@ private void prepareForPhase(GamePhase phase) {
                 // commander initiative bonus. Now that initiative is rolled, clear the flag.
                 game.getEntities().forEachRemaining(e -> e.getCrew().resetActedFlag());
 
-                if (!game.shouldDeployThisRound()) {
-                    incrementAndSendGameRound();
-                    asService.performRollingAutosave(this);
-                }
+                incrementAndSendGameRound();
+                asService.performRollingAutosave(this);
 
                 // setIneligible(phase);
                 determineTurnOrder(phase);

diff --git a/megamek/src/megamek/server/SBFGameManager.java b/megamek/src/megamek/server/SBFGameManager.java
@@ -478,10 +478,8 @@ private void prepareForCurrentPhase() {
                 // commander initiative bonus. Now that initiative is rolled, clear the flag.
 //                game.getEntities().forEachRemaining(e -> e.getCrew().resetActedFlag());
 
-                if (!game.shouldDeployThisRound()) {
 //                    incrementAndSendGameRound();
 //                    asService.performRollingAutosave(this);
-                }
 
                 // setIneligible(phase);
 //                determineTurnOrder(phase);