more fixes for squadron creation

MegaMek · Aug 2, 2024 · 55b3d63 · 55b3d63
1 parent b9c72a7
commit 55b3d63
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/megamek/src/megamek/common/Entity.java b/megamek/src/megamek/common/Entity.java
@@ -14228,13 +14228,8 @@ public double getAlternateCost() {
      */
     public boolean isTrapped() {
         if (getTransportId() != Entity.NONE) {
-            Entity transport = game.getEntity(getTransportId());
-            if (transport == null) {
-                transport = game.getOutOfGameEntity(getTransportId());
-            }
-            if (transport.isDestroyed()) {
-                return true;
-            }
+            Entity transport = game.getEntityFromAllSources(getTransportId());
+            return (transport != null) && transport.isDestroyed();
         }
         return false;
     }

diff --git a/megamek/src/megamek/server/GameManager.java b/megamek/src/megamek/server/GameManager.java
@@ -29132,7 +29132,9 @@ private void receiveSquadronAdd(Packet c, int connIndex) {
                 entityUpdate(fighter.getId());
             }
         }
-        // If this is the lounge, we want to configure bombs
+        fs.updateSkills();
+        fs.updateWeaponGroups();
+        fs.updateSensors();
         fs.autoSetMaxBombPoints();
         if (!getGame().getPhase().isLounge()) {
             fs.applyBombs();