diff --git a/src/main/java/dev/boarbot/commands/boar/DailySubcommand.java b/src/main/java/dev/boarbot/commands/boar/DailySubcommand.java index 3241ee4..1772be8 100644 --- a/src/main/java/dev/boarbot/commands/boar/DailySubcommand.java +++ b/src/main/java/dev/boarbot/commands/boar/DailySubcommand.java @@ -143,12 +143,12 @@ public void doSynchronizedAction(BoarUser boarUser) { connection, Objects.requireNonNull(this.interaction.getGuild()).getId() ); + this.boarIDs = BoarUtil.getRandBoarIDs(blessings, isSkyblockGuild); + if (TimeUtil.isAnniversary()) { - this.boarIDs.add("birthday"); + this.boarIDs.addFirst("birthday"); } - this.boarIDs = BoarUtil.getRandBoarIDs(blessings, isSkyblockGuild); - boarUser.boarQuery().addBoars( this.boarIDs, connection, diff --git a/src/main/java/dev/boarbot/util/time/TimeUtil.java b/src/main/java/dev/boarbot/util/time/TimeUtil.java index 3626f96..f5a5719 100644 --- a/src/main/java/dev/boarbot/util/time/TimeUtil.java +++ b/src/main/java/dev/boarbot/util/time/TimeUtil.java @@ -101,7 +101,7 @@ private static boolean isEaster(LocalDate date) { } public static boolean isAnniversary() { - return LocalDate.now(ZoneOffset.UTC).getMonth() == Month.JULY && getDayOfMonth() == 1; + return LocalDate.now(ZoneOffset.UTC).getMonth() == Month.JULY && getDayOfMonth() <= 2; } public static int getDayOfMonth() {