Fix: Fixed Double Welcome to Faction Message for Mercenary Campaigns #7299
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #7299 +/- ##
============================================
- Coverage 12.70% 12.69% -0.02%
+ Complexity 7575 7574 -1
============================================
Files 1166 1171 +5
Lines 149038 149162 +124
Branches 22867 22888 +21
============================================
- Hits 18939 18936 -3
- Misses 128067 128191 +124
- Partials 2032 2035 +3 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a duplication issue in the welcome message for Mercenary campaigns by adding a missing return in the confirmation action listener.
- Adds an early
returnafter launching a new mercenary organization to prevent the welcome message from firing twice. - Confirms that the pirate faction branch still returns immediately and skips further processing.
- No other functional changes.
Comments suppressed due to low confidence (1)
MekHQ/src/mekhq/gui/dialog/CompanyGenerationDialog.java:161
- [nitpick] Avoid using a hardcoded string literal for the Mercenary faction code; use a shared constant (e.g.,
MERC_FACTION_CODE) for consistency with the pirate branch.
if (campaignFactionCode.equals("MERC")) {
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Just a minor conditional return statement missing. Easily fixed.