From 2c5c087381770e008e4a6bb630285304353dfb18 Mon Sep 17 00:00:00 2001
From: "BT (calcastor/mame)" <43831917+calcastor@users.noreply.github.com>
Date: Tue, 20 May 2025 16:26:32 -0700
Subject: [PATCH] Build against SportPaper-Paper intersect jar

---
 pom.xml                                       | 23 +++++++++++++++----
 .../tc/oc/occ/database/ConnectionPool.java    |  2 +-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 94a5ea6..7ceeca6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,11 +40,11 @@
 	</repositories>
 
 	<dependencies>
-		<!-- SportPaper 1.8 -->
+		<!-- Intersected SportPaper 1.8-Paper 1.21.5 jar -->
 		<dependency>
-			<groupId>app.ashcon</groupId>
-			<artifactId>sportpaper</artifactId>
-			<version>1.8.8-R0.1-SNAPSHOT</version>
+			<groupId>dev.pgm.paper</groupId>
+			<artifactId>paper-api</artifactId>
+			<version>1.8_1.21.5-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -71,6 +71,21 @@
 			<scope>compile</scope>
 		</dependency>
 
+		<!-- Annotations -->
+		<dependency>
+			<groupId>org.jetbrains</groupId>
+			<artifactId>annotations</artifactId>
+			<version>26.0.2</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- BungeeCord api, same as in Paper 1.21 -->
+		<dependency>
+			<groupId>net.md-5</groupId>
+			<artifactId>bungeecord-api</artifactId>
+			<version>1.21-R0.2</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/src/main/java/tc/oc/occ/database/ConnectionPool.java b/src/main/java/tc/oc/occ/database/ConnectionPool.java
index 08bcdb0..704ad54 100644
--- a/src/main/java/tc/oc/occ/database/ConnectionPool.java
+++ b/src/main/java/tc/oc/occ/database/ConnectionPool.java
@@ -6,9 +6,9 @@
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
 import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nullable;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.Nullable;
 
 public class ConnectionPool {