diff --git a/megamek/src/megamek/common/AbstractGame.java b/megamek/src/megamek/common/AbstractGame.java index b5968b76fae..6ea08c90635 100644 --- 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> 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 index 4f577171d90..23eea4cab11 100644 --- a/megamek/src/megamek/common/Game.java +++ b/megamek/src/megamek/common/Game.java @@ -1319,7 +1319,7 @@ public void removeEntities(List 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 index 4241df17bcf..bc8e19b7476 100644 --- a/megamek/src/megamek/server/GameManager.java +++ b/megamek/src/megamek/server/GameManager.java @@ -1864,10 +1864,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 index 430ff71b671..60388f03c97 100644 --- 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);