Merge pull request #3822 from jackreichelt/3194-awarding-non-stackabl…

…e-medals #3194 Awarding non-stackable medals to multiple people
MegaMek · Feb 4, 2024 · 3aa366f · 3aa366f
2 parents 3afc62f + d96e9a5
commit 3aa366f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/MekHQ/src/mekhq/campaign/personnel/PersonAwardController.java b/MekHQ/src/mekhq/campaign/personnel/PersonAwardController.java
@@ -108,12 +108,18 @@ public void addAndLogAward(final Campaign campaign, final String setName,
         final Award award;
         if (hasAward(setName, awardName)) {
             award = getAward(setName, awardName);
+
+            if (!award.canBeAwarded(person)) {
+                LogManager.getLogger().info("Award not stackable, returning.");
+                return;
+            }
         } else {
             award = AwardsFactory.getInstance().generateNew(setName, awardName);
             if (award == null) {
                 LogManager.getLogger().error("Cannot award a null award, returning.");
                 return;
             }
+
             awards.add(award);
         }
 

diff --git a/MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java b/MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java
@@ -1297,7 +1297,7 @@ protected Optional<JPopupMenu> createPopupMenu() {
             Collections.sort(awardsOfSet);
 
             for (Award award : awardsOfSet) {
-                if (!award.canBeAwarded(selected)) {
+                if (oneSelected && !award.canBeAwarded(selected)) {
                     continue;
                 }