From 757d6620d7b1ecd414a39a017aaa3574962f9f1d Mon Sep 17 00:00:00 2001
From: libraryaddict <github@lib.co.nz>
Date: Sun, 11 Jun 2023 18:22:50 +1200
Subject: [PATCH] Downgrade junit

---
 plugin/pom.xml                                | 22 +++++++------------
 .../disguise/utilities/DisguiseUtilities.java |  2 +-
 pom.xml                                       |  2 +-
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index bb5f484f..3271a48e 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -118,13 +118,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit.version}</version>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -179,6 +172,13 @@
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
+        <!-- Tests -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
         <!--NMS Packages-->
         <dependency>
             <groupId>LibsDisguises</groupId>
@@ -243,49 +243,43 @@
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
-
+        <!-- Libraries -->
         <dependency>
             <groupId>it.unimi.dsi</groupId>
             <artifactId>fastutil</artifactId>
             <version>8.5.12</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>com.mojang</groupId>
             <artifactId>authlib</artifactId>
             <version>3.5.41</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>com.mojang</groupId>
             <artifactId>datafixerupper</artifactId>
             <version>5.0.28</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>com.mojang</groupId>
             <artifactId>brigadier</artifactId>
             <version>1.0.18</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-buffer</artifactId>
             <version>4.1.90.Final</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-codec</artifactId>
             <version>4.1.90.Final</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
index 35bb2107..fe8c38d8 100644
--- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
+++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
@@ -292,7 +292,7 @@ public class DisguiseUtilities {
         whitelistedEnchantments.add(Enchantment.DEPTH_STRIDER);
         whitelistedEnchantments.add(Enchantment.OXYGEN);
 
-        if (NmsVersion.v1_13.isSupported()) {
+        if (Bukkit.getServer() != null && NmsVersion.v1_13.isSupported()) {
             whitelistedEnchantments.add(Enchantment.RIPTIDE);
 
             if (NmsVersion.v1_19_R1.isSupported()) {
diff --git a/pom.xml b/pom.xml
index 2c698d24..72863e8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
         <lombok.version>1.18.26</lombok.version>
         <protocollib.version>5.0.0</protocollib.version>
         <spigot.version>1.20-R0.1-SNAPSHOT</spigot.version>
-        <junit.version>5.9.3</junit.version>
+        <junit.version>4.13.2</junit.version>
         <paper-api.version>1.19.4-R0.1-SNAPSHOT</paper-api.version>
         <bungeecord-chat.version>1.16-R0.4</bungeecord-chat.version>
         <adventure-minimessage.version>4.13.0</adventure-minimessage.version>