GameManager: prevent bomb choices from being erased when creating a F…

…ighterSquadron
MegaMek · Aug 2, 2024 · b9c72a7 · b9c72a7
1 parent 58b72c9
commit b9c72a7
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/megamek/src/megamek/server/GameManager.java b/megamek/src/megamek/server/GameManager.java
@@ -29128,15 +29128,15 @@ private void receiveSquadronAdd(Packet c, int connIndex) {
             if (null != fighter) {
                 formerCarriers.addAll(ServerLobbyHelper.lobbyUnload(game, List.of(fighter)));
                 fs.load(fighter, false);
-                fs.autoSetMaxBombPoints();
                 fighter.setTransportId(fs.getId());
-                // If this is the lounge, we want to configure bombs
-                if (getGame().getPhase().isLounge()) {
-                    ((IBomber) fighter).setBombChoices(fs.getExtBombChoices());
-                }
                 entityUpdate(fighter.getId());
             }
         }
+        // If this is the lounge, we want to configure bombs
+        fs.autoSetMaxBombPoints();
+        if (!getGame().getPhase().isLounge()) {
+            fs.applyBombs();
+        }
         if (!formerCarriers.isEmpty()) {
             send(new Packet(PacketCommand.ENTITY_MULTIUPDATE, formerCarriers));
         }