Fix merge issue following rebase and pull from origin

MegaMek · Dec 28, 2023 · 97d94af · 97d94af
1 parent ac56176
commit 97d94af
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 35 deletions.
diff --git a/megamek/src/megamek/common/LandAirMech.java b/megamek/src/megamek/common/LandAirMech.java
@@ -1121,28 +1121,6 @@ public void setIntBombChoices(int[] bc) {
         }
     }
 
-    public void setUsedInternalBombs(int b){
-        // Do nothing; LAMs don't take internal bomb bay hits like this
-    }
-
-    public void increaseUsedInternalBombs(int b){
-        // Do nothing
-    }
-
-    public int getUsedInternalBombs() {
-        // Currently not possible
-        return 0;
-    }
-
-    @Override
-    public int[] getExtBombChoices() {
-        return extBombChoices;
-    }
-
-    @Override
-    public void setExtBombChoices(int[] bc) {
-    }
-
     @Override
     public void setUsedInternalBombs(int b){
         // Do nothing; LAMs don't take internal bomb bay hits like this

diff --git a/megamek/src/megamek/common/VTOL.java b/megamek/src/megamek/common/VTOL.java
@@ -301,19 +301,6 @@ public int reduceMPByBombLoad(int t) {
         return Math.max(0, (t - (int) this.getBombs().stream().filter(m -> (m.getUsableShotsLeft() > 0)).count()));
     }
 
-    public void setUsedInternalBombs(int b){
-        // Do nothing
-    }
-
-    public void increaseUsedInternalBombs(int b){
-        // Do nothing
-    }
-
-    public int getUsedInternalBombs() {
-        // Currently not possible
-        return 0;
-    }
-
     @Override
     public void setUsedInternalBombs(int b){
         // Do nothing