From 35d52f8c452998575d12bf4a369edc39ec074b8e Mon Sep 17 00:00:00 2001
From: iambibi_ <89582596+iambibi@users.noreply.github.com>
Date: Mon, 24 Aug 2026 11:06:27 +0200
Subject: [PATCH] fix: end weeklyevents

---
 .../core/features/displays/scoreboards/sb/MainScoreboard.java | 4 ++--
 .../events/contents/weeklyevents/WeeklyEventsManager.java     | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/fr/openmc/core/features/displays/scoreboards/sb/MainScoreboard.java b/src/main/java/fr/openmc/core/features/displays/scoreboards/sb/MainScoreboard.java
index 858cfa1c0..3464de51a 100644
--- a/src/main/java/fr/openmc/core/features/displays/scoreboards/sb/MainScoreboard.java
+++ b/src/main/java/fr/openmc/core/features/displays/scoreboards/sb/MainScoreboard.java
@@ -22,7 +22,6 @@
 import fr.openmc.core.hooks.LuckPermsHook;
 import fr.openmc.core.hooks.WorldGuardHook;
 import fr.openmc.core.utils.text.DateUtils;
-import fr.openmc.core.utils.text.DirectionUtils;
 import fr.openmc.core.utils.text.messages.TranslationManager;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
@@ -66,7 +65,8 @@ public void update(Player player, SternalBoard board) {
         }
 
         // Contest
-        if (WeeklyEventsManager.getCurrentEvent() instanceof Contest) {
+        if (WeeklyEventsManager.isEventActive() &&
+                WeeklyEventsManager.getCurrentEvent() instanceof Contest) {
             ContestData data = ContestManager.data;
             if (WeeklyEventsManager.getCurrentPhase() != ContestPhase.VOTE_CAMP.getPhase()) {
                 lines.add(MiniMessage.miniMessage().deserialize(
diff --git a/src/main/java/fr/openmc/core/features/events/contents/weeklyevents/WeeklyEventsManager.java b/src/main/java/fr/openmc/core/features/events/contents/weeklyevents/WeeklyEventsManager.java
index a4d455cd0..8dccea4b8 100644
--- a/src/main/java/fr/openmc/core/features/events/contents/weeklyevents/WeeklyEventsManager.java
+++ b/src/main/java/fr/openmc/core/features/events/contents/weeklyevents/WeeklyEventsManager.java
@@ -81,7 +81,6 @@ public static void save(WeeklyEventsData data) {
      * Retourne l'event en cours.
      */
     public static WeeklyEvent getCurrentEvent() {
-        if (!WeeklyEventsManager.isEventActive()) return null;
         return OMCRegistry.WEEKLY_EVENTS.get(data.getCurrentEvent()).orElse(null);
     }