From b0a29f95e8e8a9d230eb4e209226b3fc37a5ce67 Mon Sep 17 00:00:00 2001
From: BenCodez <17074231+BenCodez@users.noreply.github.com>
Date: Sun, 30 Aug 2026 19:27:13 -0600
Subject: [PATCH] Isolate Bukkit server test mock

---
 .../tests/votesite/VoteSiteAdditionalTest.java       | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/votesite/VoteSiteAdditionalTest.java b/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/votesite/VoteSiteAdditionalTest.java
index 0932f4923..326ea4a41 100644
--- a/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/votesite/VoteSiteAdditionalTest.java
+++ b/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/votesite/VoteSiteAdditionalTest.java
@@ -13,6 +13,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.inventory.ItemFactory;
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +32,7 @@
  * Extra unit tests for {@link VoteSite}.
  */
 public class VoteSiteAdditionalTest {
+    private static MockedStatic<Bukkit> mockedBukkit;
 
     private VotingPluginMain plugin;
     private ConfigVoteSites cfg;
@@ -46,7 +48,15 @@ public static void setupBukkitMinimal() {
         when(mockServer.getItemFactory()).thenReturn(mockItemFactory);
         when(mockServer.getLogger()).thenReturn(mockLogger);
 
-        Bukkit.setServer(mockServer);
+        mockedBukkit = mockStatic(Bukkit.class);
+        mockedBukkit.when(Bukkit::getServer).thenReturn(mockServer);
+        mockedBukkit.when(Bukkit::getItemFactory).thenReturn(mockItemFactory);
+        mockedBukkit.when(Bukkit::getLogger).thenReturn(mockLogger);
+    }
+
+    @AfterAll
+    public static void tearDownBukkitMinimal() {
+        mockedBukkit.close();
     }
 
     @BeforeEach