Merge pull request #408 from Shynixn/development

Merge changes to master --release
Shynixn · Jul 8, 2021 · 9b7e3a7 · 9b7e3a7
2 parents 8b3b3c1 + 1e076c4
commit 9b7e3a7
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -37,7 +37,7 @@ RUN ./gradlew build pluginJar --no-daemon
 # 4. Launch a minecraft server with jdk16 and plugin
 FROM adoptopenjdk/openjdk16
 # Change to the current plugin version present in build.gradle
-ENV PLUGIN_VERSION=6.25.3
+ENV PLUGIN_VERSION=6.25.4
 # Change to the server version you want to test.
 ENV SERVER_VERSION=1.17.1-R0.1-SNAPSHOT/spigot-1.17.1-R0.1-SNAPSHOT.jar
 # Port of the Minecraft Server.

diff --git a/...m/github/shynixn/blockball/bukkit/logic/business/service/PacketJavaProtocolServiceImpl.kt b/...m/github/shynixn/blockball/bukkit/logic/business/service/PacketJavaProtocolServiceImpl.kt
@@ -51,11 +51,22 @@ class PacketJavaProtocolServiceImpl @Inject constructor(
         }
     }
     private val intArrayListConstructor by lazy {
-        pluginProxy.findClazz("org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.ints.IntArrayList")
-            .getDeclaredConstructor(IntArray::class.java)
+        try {
+            // Paper Spigot shades a different IntList
+            pluginProxy.findClazz("org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.ints.IntArrayList")
+                .getDeclaredConstructor(IntArray::class.java)
+        } catch (e: Exception) {
+            pluginProxy.findClazz("it.unimi.dsi.fastutil.ints.IntArrayList")
+                .getDeclaredConstructor(IntArray::class.java)
+        }
     }
     private val packetPlayOutEntityDestroyIntListConstructor by lazy {
-        packetPlayOutEntityDestroyClazz.getDeclaredConstructor(pluginProxy.findClazz("org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.ints.IntList"))
+        try {
+            // Paper Spigot shades a different IntList
+            packetPlayOutEntityDestroyClazz.getDeclaredConstructor(pluginProxy.findClazz("org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.ints.IntList"))
+        } catch (e: Exception) {
+            packetPlayOutEntityDestroyClazz.getDeclaredConstructor(pluginProxy.findClazz("it.unimi.dsi.fastutil.ints.IntList"))
+        }
     }
 
     /**

diff --git a/blockball-bukkit-plugin/src/main/resources/plugin-1.17.yml b/blockball-bukkit-plugin/src/main/resources/plugin-1.17.yml
@@ -1,5 +1,5 @@
 name: BlockBall
-version: 6.25.3
+version: 6.25.4
 author: Shynixn
 website: https://www.spigotmc.org/members/shynixn.63455/
 main: com.github.shynixn.blockball.bukkit.BlockBallPlugin

diff --git a/blockball-bukkit-plugin/src/main/resources/plugin.yml b/blockball-bukkit-plugin/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: BlockBall
-version: 6.25.3
+version: 6.25.4
 author: Shynixn
 website: https://www.spigotmc.org/members/shynixn.63455/
 main: com.github.shynixn.blockball.bukkit.BlockBallPlugin

diff --git a/build.gradle b/build.gradle
@@ -44,7 +44,7 @@ tasks.register("printVersion") {
 
 subprojects {
     group 'com.github.shynixn.blockball'
-    version '6.25.3'
+    version '6.25.4'
 
     sourceCompatibility = 1.8
 

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '6.25.3'
+version = '6.25.4'
 # The full version, including alpha/beta/rc tags.
-release = '6.25.3'
+release = '6.25.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.