Skip to content

Limit automatic month-change recovery to 12 hours #346

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

Merged
BenCodez merged 1 commit into from
Sep 26, 2026
Merged

Limit automatic month-change recovery to 12 hours #346

Show file tree
Hide file tree
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
10 changes: 6 additions & 4 deletions AdvancedCore/src/main/java/com/bencodez/advancedcore/api/time/TimeChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,13 +242,15 @@ public boolean hasDayChanged(boolean set) {

public boolean hasMonthChanged(boolean set) {
String prevMonth = plugin.getServerDataFile().getPrevMonth();
String month = getTime().getMonth().toString();
LocalDateTime current = getTime();
String month = current.getMonth().toString();
if (prevMonth.equals(month)) return false;
if (set) plugin.getServerDataFile().setPrevMonth(month);
if (!plugin.getOptions().isTimeChangeFailSafeBypass() && getTime().getDayOfMonth() > 3) {
LocalDateTime graceEnd = current.withDayOfMonth(1).toLocalDate().atStartOfDay().plusHours(12);
if (!plugin.getOptions().isTimeChangeFailSafeBypass() && current.isAfter(graceEnd)) {
plugin.getLogger().warning(
"Detected a month change, but current day is not near end of a month, ignoring month change, "
+ getTime().getDayOfMonth());
"Detected a month change outside the first 12 hours of the month, ignoring month change: "
+ current);
plugin.getServerDataFile().setPrevMonth(month);
return false;
}
Expand Down
10 changes: 6 additions & 4 deletions AdvancedCore/src/main/java/com/bencodez/advancedcore/bungeeapi/time/BungeeTimeChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,18 @@ public boolean hasDayChanged(boolean set) {

public boolean hasMonthChanged(boolean set) {
String prevMonth = getPrevMonth();
String month = getTime().getMonth().toString();
LocalDateTime current = getTime();
String month = current.getMonth().toString();
if (prevMonth.equals(month)) {
return false;
}
if (set) {
setPrevMonth(month);
}
if (!timeChangeFailSafeBypass && getTime().getDayOfMonth() > 3) {
warning("Detected a month change, but current day is not near end of a month, ignoring month change, "
+ getTime().getDayOfMonth());
LocalDateTime graceEnd = current.withDayOfMonth(1).toLocalDate().atStartOfDay().plusHours(12);
if (!timeChangeFailSafeBypass && current.isAfter(graceEnd)) {
warning("Detected a month change outside the first 12 hours of the month, ignoring month change: "
+ current);
setPrevMonth(month);
return false;
}
Expand Down
4 changes: 4 additions & 0 deletions AdvancedCore/src/test/java/com/bencodez/advancedcore/tests/time/BungeeTimeCheckerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,10 @@ public void warning(String text) {

assertTrue(result);
verify(timeChecker).setPrevMonth("NOVEMBER");

Mockito.doReturn(LocalDateTime.of(2023, 11, 1, 12, 0, 1)).when(timeChecker).getTime();
assertFalse(timeChecker.hasMonthChanged(false));
verify(timeChecker, Mockito.times(2)).setPrevMonth("NOVEMBER");
}

@Test
Expand Down
16 changes: 16 additions & 0 deletions AdvancedCore/src/test/java/com/bencodez/advancedcore/tests/time/TimeCheckerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,22 @@ public void testDayWeekMonthChanges() {
}
}

@Test
public void monthChangeFailSafeRejectsStaleChangeAfterTwelveHours() {
when(serverDataFile.getPrevMonth()).thenReturn("DECEMBER");
when(options.isTimeChangeFailSafeBypass()).thenReturn(false);
when(plugin.getLogger()).thenReturn(Logger.getLogger("TimeCheckerTest"));

TimeChecker timeChecker = Mockito.spy(new TimeChecker(plugin));

Mockito.doReturn(LocalDateTime.of(2025, 1, 1, 12, 0)).when(timeChecker).getTime();
assertTrue(timeChecker.hasMonthChanged(false));

Mockito.doReturn(LocalDateTime.of(2025, 1, 1, 12, 0, 1)).when(timeChecker).getTime();
assertFalse(timeChecker.hasMonthChanged(false));
verify(serverDataFile).setPrevMonth("JANUARY");
}

@Test
public void detectedTransitionAdvancesMarkerOnlyAfterSuccessfulDispatch() {
TimeChangeTransitionState transition = transitionState();
Expand Down
Loading