Merge pull request #5891 from SJuliez/round-count-again

#5817: Re-apply round increase fix from #5545
MegaMek · Aug 13, 2024 · 73b326a · 73b326a
2 parents 8b0a989 + 50a0f41
commit 73b326a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/megamek/src/megamek/server/TWPhasePreparationManager.java b/megamek/src/megamek/server/TWPhasePreparationManager.java
@@ -71,10 +71,8 @@ void managePhase() {
                 // commander initiative bonus. Now that initiative is rolled, clear the flag.
                 gameManager.getGame().getEntitiesVector().forEach(e -> e.getCrew().resetActedFlag());
 
-                if (!gameManager.getGame().shouldDeployThisRound()) {
-                    gameManager.incrementAndSendGameRound();
-                    gameManager.autoSaveService.performRollingAutosave();
-                }
+                gameManager.incrementAndSendGameRound();
+                gameManager.autoSaveService.performRollingAutosave();
 
                 // setIneligible(phase);
                 gameManager.determineTurnOrder(phase);

diff --git a/megamek/src/megamek/server/sbf/SBFPhasePreparationManager.java b/megamek/src/megamek/server/sbf/SBFPhasePreparationManager.java
@@ -57,10 +57,8 @@ void managePhase() {
                 // new round
                 gameManager.rollInitiative();
 
-                if (!game().shouldDeployThisRound()) {
-                    gameManager.incrementAndSendGameRound();
-                    gameManager.getAutoSaveService().performRollingAutosave();
-                }
+                gameManager.incrementAndSendGameRound();
+                gameManager.getAutoSaveService().performRollingAutosave();
 
                 gameManager.initiativeHelper.determineTurnOrder(game().getPhase());
                 gameManager.initiativeHelper.writeInitiativeReport();