From 54c4f60abb1538a2e2395b5a58046629ad8a5377 Mon Sep 17 00:00:00 2001 From: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com> Date: Sun, 26 Jun 2022 03:05:08 -0700 Subject: [PATCH] Fix next sunday. --- .../emu/grasscutter/game/battlepass/BattlePassManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java b/src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java index c5775edf9..028312d90 100644 --- a/src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java +++ b/src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java @@ -352,7 +352,10 @@ public class BattlePassManager { // public BattlePassSchedule getScheduleProto() { - var nextSundayDate = LocalDate.now().with(TemporalAdjusters.next(DayOfWeek.SUNDAY)); + var currentDate = LocalDate.now(); + var nextSundayDate = (currentDate.getDayOfWeek() == DayOfWeek.SUNDAY) + ? currentDate + : LocalDate.now().with(TemporalAdjusters.next(DayOfWeek.SUNDAY)); var nextSundayTime = LocalDateTime.of(nextSundayDate.getYear(), nextSundayDate.getMonthValue(), nextSundayDate.getDayOfMonth(), 23, 59, 59); BattlePassSchedule.Builder schedule = BattlePassSchedule.newBuilder()