From a7e029b0a165d0dbbb360f3e36a4a117cc51f0be Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Sun, 31 Mar 2024 10:56:21 +0200 Subject: [PATCH] Refactor April 1st date check in ChatListener Removed the more complex date logic used to check for April 1st in the ChatListener class. This check checked if it was April 1st in any timezone. Replaced it with a simpler check using LocalDate's methods for month and day comparison. This only checks if it's April 1st in UTC. This aims to enhance code readability and simplify date handling. --- .../java/com/alttd/chat/listeners/ChatListener.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java index 7bf95a6..fbac473 100755 --- a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java +++ b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java @@ -60,14 +60,6 @@ public class ChatListener implements Listener { event.result(formatComponent.replaceText(TextReplacementConfig.builder().match("%message%").replacement(message).build())); } - ZonedDateTime aprilFirstUTCMidnight = ZonedDateTime.of(LocalDate.now().getYear(), 4, 1, 0, 0, 0, 0, ZoneId.of("UTC")); - ZonedDateTime aprilFirstStart = aprilFirstUTCMidnight.minusHours(24); - ZonedDateTime aprilFirstEnd = aprilFirstUTCMidnight.plusHours(24); - private boolean isWithinApril1st() { - ZonedDateTime now = ZonedDateTime.now(ZoneId.of("UTC")); - return now.isAfter(aprilFirstStart) && now.isBefore(aprilFirstEnd); - } - private final Component mention = MiniMessage.miniMessage().deserialize(Config.MENTIONPLAYERTAG); @EventHandler(ignoreCancelled = true) public void onPlayerChat(AsyncChatEvent event) { @@ -116,7 +108,8 @@ public class ChatListener implements Listener { Set playersToPing = new HashSet<>(); pingPlayers(playersToPing, modifiableString, player); - if (isWithinApril1st()) { + LocalDate now = LocalDate.now(); + if (now.getMonth().equals(Month.APRIL) && now.getDayOfMonth() == 1) { if (modifiableString.string().startsWith(Config.APRIL_FOOLS_RESET + " ")) { modifiableString.removeStringAtStart(Config.APRIL_FOOLS_RESET + " "); } else {