Merge pull request #4797 from Sleet01/fix_3761_update_munitions_equal…

…ity_tests_mm Fix MekHQ #3761: update munitions equality tests in mm
MegaMek · Sep 21, 2023 · 60603a2 · 60603a2
2 parents 027a6d3 + b418dee
commit 60603a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java b/megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java
@@ -229,7 +229,7 @@ public String getElementAt(int index) {
                 int totalShots = 0;
                 EnumSet<AmmoType.Munitions> munition = ((AmmoType) mounted.getLinked().getType()).getMunitionType();
                 for (Mounted current = mounted.getLinked(); current != null; current = current.getLinked()) {
-                    if (((AmmoType) current.getType()).getMunitionType() == munition) {
+                    if (((AmmoType) current.getType()).getMunitionType().equals(munition)) {
                         shotsLeft += current.getUsableShotsLeft();
                         totalShots += current.getOriginalShots();
                     }

diff --git a/megamek/src/megamek/common/AmmoType.java b/megamek/src/megamek/common/AmmoType.java
@@ -407,7 +407,7 @@ public boolean isCompatibleWith(AmmoType other) {
         }
 
         // MML Launchers, ugh.
-        if ((is(T_MML) || other.is(T_MML)) && (getMunitionType() == other.getMunitionType())) {
+        if ((is(T_MML) || other.is(T_MML)) && (getMunitionType().equals(other.getMunitionType()))) {
             // LRMs...
             if (is(T_MML) && hasFlag(F_MML_LRM) && other.is(T_LRM)) {
                 return true;
@@ -424,7 +424,7 @@ public boolean isCompatibleWith(AmmoType other) {
         }
 
         // General Launchers
-        if (is(other.getAmmoType()) && (getMunitionType() == other.getMunitionType())) {
+        if (is(other.getAmmoType()) && (getMunitionType().equals(other.getMunitionType()))) {
             return true;
         }