Various fixes & improvements (#246)

* HuskClaims Support

* Bump Lombok for compilation and fix other obscure issues

* Resolve database locking

* Have the executor service perform in multiple places

* Utilize a ConcurrentHashMap instead of a HashMap for player data management to mitigate fast connections and thread switching

* Reapply modifications with UUID checking for this particular instance

* Apply additional null checks to mitigate player reading exceptions once again

* Fix RTP on death on custom worlds and add it to debug print

* Migrate to newer FoliaLib module and fix compilation again

* Fix Min-Max Radius

Co-authored-by: ZepsiZola <zepsizola@gmail.com>

* Implement labeled HuskClaims support since it's internally implemented

* Rebase

* Likely make thread-safe

* Resolve obscure and rare ArrayIndexOutOfBoundsException

---------

Co-authored-by: JMaleta <13309090+JMeta0@users.noreply.github.com>
Co-authored-by: ZepsiZola <zepsizola@gmail.com>
This commit is contained in:
R00tB33rMan
2026-07-06 20:00:51 -04:00
committed by GitHub
parent 15fc3eba67
commit 4697f06163
13 changed files with 206 additions and 318 deletions
+20 -32
View File
@@ -25,7 +25,7 @@
<!-- Local Server Building -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
<version>3.4.2</version>
<configuration>
<outputDirectory>../../Java/plugins</outputDirectory>
</configuration>
@@ -47,13 +47,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.0</version>
<version>3.1.4</version>
</plugin>
<plugin>
<!-- Shade PaperLib into project -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
<configuration>
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml
</dependencyReducedPomLocation>
@@ -66,10 +66,6 @@
<pattern>com.tcoded.folialib</pattern>
<shadedPattern>me.SuperRonanCraft.BetterRTP.lib.folialib</shadedPattern>
</relocation>
<!--relocation>
<pattern>xyz.xenondevs.particle</pattern>
<shadedPattern>me.SuperRonanCraft.BetterRTP.particleLib</shadedPattern>
</relocation-->
</relocations>
</configuration>
<executions>
@@ -84,7 +80,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<version>3.14.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -105,6 +101,11 @@
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
<!-- FoliaLib Repo -->
<repository>
<id>tcoded-releases</id>
<url>https://repo.tcoded.com/releases</url>
</repository>
<!-- Spigot Repo -->
<repository>
<id>spigot-repo</id>
@@ -120,7 +121,7 @@
<id>vault-repo</id>
<url>https://nexus.hc.to/content/repositories/pub_releases</url>
</repository>
<!-- Worldguard Repo -->
<!-- WorldGuard Repo -->
<repository>
<id>sk89q-repo</id>
<url>https://maven.enginehub.org/repo/</url>
@@ -191,7 +192,7 @@
<version>1.0.8</version>
<scope>compile</scope>
</dependency>
<!-- Worldguard (https://dev.bukkit.org/projects/worldguard) -->
<!-- WorldGuard (https://dev.bukkit.org/projects/worldguard) -->
<dependency> <!-- Saber Factions screws up if updated -->
<groupId>com.sk89q.worldguard</groupId>
<artifactId>worldguard-bukkit</artifactId>
@@ -229,7 +230,7 @@
<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib</artifactId>
<version>4.8.0</version>
<version>5.3.0</version>
<scope>provided</scope>
</dependency>
<!-- Towny (https://www.spigotmc.org/resources/towny.72694/) -->
@@ -243,10 +244,10 @@
<dependency>
<groupId>com.github.TechFortress</groupId>
<artifactId>GriefPrevention</artifactId>
<version>16.18</version>
<version>17.0.0</version>
<scope>provided</scope>
</dependency>
<!-- KingdomsX v1.10.5.2 (https://www.spigotmc.org/resources/kingdomsx.77670/) -->
<!-- KingdomsX (https://www.spigotmc.org/resources/kingdomsx.77670/) -->
<dependency>
<groupId>com.github.cryptomorin</groupId>
<artifactId>kingdoms</artifactId>
@@ -286,14 +287,14 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.26</version>
<version>1.18.38</version>
<scope>provided</scope>
</dependency>
<!-- EssentialsX -->
<dependency>
<groupId>net.essentialsx</groupId>
<artifactId>EssentialsX</artifactId>
<version>2.20.1</version>
<version>2.21.0</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -319,14 +320,14 @@
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.11.2</version>
<version>2.11.6</version>
<scope>provided</scope>
</dependency>
<!-- HuskClaims (https://www.spigotmc.org/resources/huskclaims.114467/) (Added in 3.6.13)-->
<dependency>
<groupId>net.william278.huskclaims</groupId>
<artifactId>huskclaims-bukkit</artifactId>
<version>1.5.2</version>
<version>1.5.10</version>
<scope>provided</scope>
</dependency>
<!-- Husktown (https://www.spigotmc.org/resources/husktowns.92672/) (Added in 3.4.5)-->
@@ -345,9 +346,9 @@
</dependency>
<!-- FoliaLib -->
<dependency>
<groupId>com.github.TechnicallyCoded</groupId>
<groupId>com.tcoded</groupId>
<artifactId>FoliaLib</artifactId>
<version>0.4.3</version>
<version>0.5.1</version>
<scope>compile</scope>
</dependency>
<!-- FactionsBridge -->
@@ -364,19 +365,6 @@
<version>c697d3e9ef</version>
<scope>provided</scope>
</dependency>
<!-- CAN BE UNCOMMENTED IF YOU HAVE ACCESS TO THE PLUGIN -->
<!-- Private Repoed -->
<!-- This is uploaded to our private repo on https://repo.ronanplugins.com -->
<!-- hClaims (https://www.spigotmc.org/resources/90540/) -->
<!--<dependency>
<groupId>com.ronanplugins</groupId>
<artifactId>hClaims</artifactId>
<version>2.5.3</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>-->
<!-- Provided by repo: devmart-public -->
<dependency>
<groupId>com.bekvon.bukkit.residence</groupId>
<artifactId>Residence</artifactId>