Skip to content

Commit

Permalink
Merge pull request #6233 from kuronekochomusuke/issue_6232
Browse files Browse the repository at this point in the history
dont check for custom deployment zone when in game
  • Loading branch information
HammerGS authored Nov 29, 2024
2 parents d065507 + 71ff145 commit 575b798
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions megamek/src/megamek/client/ui/swing/CustomMekDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -501,9 +501,11 @@ private void refreshDeployment() {
choDeploymentZone.addItem(Messages.getString("CustomMekDialog.deployEdge"));
choDeploymentZone.addItem(Messages.getString("CustomMekDialog.deployCenter"));

for (int zoneID : ServerBoardHelper.getPossibleGameBoard(clientgui.getClient().getMapSettings(), true)
.getCustomDeploymentZones()) {
choDeploymentZone.addItem("Zone " + zoneID);
if (client.getGame().getPhase().isLounge()) {
for (int zoneID : ServerBoardHelper.getPossibleGameBoard(clientgui.getClient().getMapSettings(), true)
.getCustomDeploymentZones()) {
choDeploymentZone.addItem("Zone " + zoneID);
}
}

int startingPos = entity.getStartingPos(false);
Expand Down

0 comments on commit 575b798

Please sign in to comment.