Skip to content

Commit dd39893

Browse files
committed
Fixed merge weirdness
1 parent a8dbcc6 commit dd39893

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

MekHQ/src/mekhq/campaign/universe/factionStanding/GoingRogue.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,16 @@ public GoingRogue(Campaign campaign, Person commander, @Nullable Person second)
138138
* faction
139139
* @param commander the commanding officer of the force
140140
* @param second the second-in-command, may be {@code null}
141+
* @param isUsingFactionStandings {@code true} if the player has faction standings enabled
141142
*
142143
* @author Illiani
143144
* @since 0.50.07
144145
*/
145146
public static void processGoingRogue(Campaign campaign, Faction chosenFaction, Person commander,
146-
@Nullable Person second) {
147+
@Nullable Person second, boolean isUsingFactionStandings) {
147148
boolean isDefection = !chosenFaction.isAggregate() && !campaign.getFaction().isAggregate();
148149

149-
processGoingRogue(campaign, chosenFaction, commander, second, isDefection);
150+
processGoingRogue(campaign, chosenFaction, commander, second, isDefection, isUsingFactionStandings);
150151
}
151152

152153
/**
@@ -182,7 +183,7 @@ public static void processGoingRogue(Campaign campaign, Faction chosenFaction, P
182183
processMassLoyaltyChange(campaign, true, true);
183184

184185
if (isDefection) {
185-
new FactionJudgmentNewsArticle(campaign, commander, null, DEFECTION_NEWS_ARTICLE_LOOKUP, campaignFaction,
186+
new FactionJudgmentNewsArticle(campaign, commander, null, DEFECTION_NEWS_ARTICLE_LOOKUP, currentFaction,
186187
FactionStandingJudgmentType.WELCOME, false);
187188

188189
PersonnelRole role = chosenFaction.isClan() ? PersonnelRole.MEKWARRIOR : PersonnelRole.MILITARY_LIAISON;

0 commit comments

Comments
 (0)