Merge pull request #4895 from MegaMek/battlestation

Fix for space station rotation
MegaMek · Nov 18, 2023 · 55cf180 · 55cf180
2 parents 32eaa23 + d29ca41
commit 55cf180
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/megamek/src/megamek/common/Jumpship.java b/megamek/src/megamek/common/Jumpship.java
@@ -82,9 +82,6 @@ public class Jumpship extends Aero {
     private int escapePodsLaunched = 0;
     private int lifeBoatsLaunched = 0;
 
-    // Battlestation
-    private boolean isBattleStation = false;
-
     // HPG
     private boolean hasHPG = false;
 
@@ -482,13 +479,8 @@ public boolean hasHPG() {
         return hasHPG;
     }
 
-    public void setBattleStation(boolean b) {
-        isBattleStation = b;
-
-    }
-
     public boolean isBattleStation() {
-        return isBattleStation;
+        return false;
     }
 
     public void setLF(boolean b) {

diff --git a/megamek/src/megamek/common/SpaceStation.java b/megamek/src/megamek/common/SpaceStation.java
@@ -117,6 +117,11 @@ public int getECMRange() {
         return range;
     }
 
+    @Override
+    public boolean isBattleStation() {
+        return designType == MILITARY;
+    }
+
     @Override
     public double getBVTypeModifier() {
         return 0.7;

diff --git a/megamek/src/megamek/common/loaders/BLKSpaceStationFile.java b/megamek/src/megamek/common/loaders/BLKSpaceStationFile.java
@@ -147,11 +147,6 @@ public Entity getEntity() throws EntityLoadingException {
             a.setModular(true);
         }
 
-        // BattleStation
-        if (dataFile.exists("Battlestation")) {
-            a.setBattleStation(true);
-        }
-
         // Grav Decks - two approaches
         // First, the old method, where a number of grav decks for each category is specified
         //  This doesn't allow us to specify precise size