From 50a0f411d7488c2a1d153fe7b3e3d0302f122df3 Mon Sep 17 00:00:00 2001
From: Simon <juliez@outlook.de>
Date: Tue, 13 Aug 2024 10:33:36 +0200
Subject: [PATCH] re-apply round increase fix from #5545

---
 megamek/src/megamek/server/TWPhasePreparationManager.java   | 6 ++----
 .../src/megamek/server/sbf/SBFPhasePreparationManager.java  | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/megamek/src/megamek/server/TWPhasePreparationManager.java b/megamek/src/megamek/server/TWPhasePreparationManager.java
index 35dea5b1b96..10cd246919f 100644
--- 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
index d3393f12089..547b9f7797d 100644
--- 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();