Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed Position of NewDayEvent Trigger in processNewDay #5125

Merged
merged 1 commit into from
Oct 25, 2024
Merged

Fixed Position of NewDayEvent Trigger in processNewDay #5125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MekHQ/src/mekhq/campaign/Campaign.java
View file
Open in desktop
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