Skip to content

Commit

Permalink
Merge pull request #5125 from IllianiCBT/stratCon_tracklessScenarios
Browse files Browse the repository at this point in the history
Fixed Position of `NewDayEvent` Trigger in `processNewDay`
  • Loading branch information
HammerGS authored Oct 25, 2024
2 parents 0c2a2b2 + f892b9f commit 32077b6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions MekHQ/src/mekhq/campaign/Campaign.java
Original file line number Diff line number Diff line change
Expand Up @@ -4241,8 +4241,6 @@ public boolean newDay() {
newReports.clear();
beginReport("<b>" + MekHQ.getMHQOptions().getLongDisplayFormattedDate(getLocalDate()) + "</b>");

MekHQ.triggerEvent(new NewDayEvent(this));

// New Year Changes
if (getLocalDate().getDayOfYear() == 1) {
// News is reloaded
Expand Down Expand Up @@ -4320,6 +4318,8 @@ public boolean newDay() {
}
}

// This must be the last step before returning true
MekHQ.triggerEvent(new NewDayEvent(this));
return true;
}

Expand Down

0 comments on commit 32077b6

Please sign in to comment.