Merge pull request #426 from Shynixn/development

Merge changes to Master --release

Dockerfile

@@ -39,7 +39,7 @@ RUN ./gradlew build pluginJar --no-daemon
 # 4. Launch a minecraft server with jdk17 and plugin
 FROM amazoncorretto:17
 # Change to the current plugin version present in build.gradle
-ENV PLUGIN_VERSION=6.29.0
+ENV PLUGIN_VERSION=6.29.1
 # Change to the server version you want to test.
 ENV SERVER_VERSION=spigot-1.18.jar
 # Port of the Minecraft Server.

blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/bukkit/logic/business/service/ProtocolServiceImpl.kt

@@ -1,6 +1,7 @@
 package com.github.shynixn.blockball.bukkit.logic.business.service
 
 import com.github.shynixn.blockball.api.bukkit.event.PacketEvent
+import com.github.shynixn.blockball.api.business.enumeration.Version
 import com.github.shynixn.blockball.api.business.proxy.PluginProxy
 import com.github.shynixn.blockball.api.business.service.ProtocolService
 import com.github.shynixn.blockball.core.logic.business.extension.accessible
@@ -41,18 +42,20 @@ class ProtocolServiceImpl @Inject constructor(private val plugin: PluginProxy, p
     }
     private val channelField by lazy {
         try {
-            plugin.findClazz("net.minecraft.network.NetworkManager")
-                .getDeclaredField("m")
-                .accessible(true)
-        } catch (e: Exception) {
-            try {
+            if (plugin.getServerVersion().isVersionSameOrGreaterThan(Version.VERSION_1_18_R2)) {
+                plugin.findClazz("net.minecraft.network.NetworkManager")
+                    .getDeclaredField("m")
+                    .accessible(true)
+            } else if (plugin.getServerVersion().isVersionSameOrGreaterThan(Version.VERSION_1_17_R1)) {
                 plugin.findClazz("net.minecraft.network.NetworkManager")
                     .getDeclaredField("k")
                     .accessible(true)
-            }catch (e1 : Exception){
-                plugin.findClazz("net.minecraft.server.VERSION.NetworkManager")
-                    .getDeclaredField("channel")
+            } else {
+                throw RuntimeException("Impl not found!")
             }
+        } catch (e1: Exception) {
+            plugin.findClazz("net.minecraft.server.VERSION.NetworkManager")
+                .getDeclaredField("channel")
         }
     }
 

blockball-bukkit-plugin/src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: BlockBall
-version: 6.29.0
+version: 6.29.1
 author: Shynixn
 website: https://www.spigotmc.org/members/shynixn.63455/
 main: com.github.shynixn.blockball.bukkit.BlockBallPlugin

build.gradle

@@ -44,7 +44,7 @@ tasks.register("printVersion") {
 
 subprojects {
     group 'com.github.shynixn.blockball'
-    version '6.29.0'
+    version '6.29.1'
 
     sourceCompatibility = 1.8
 

docs/source/conf.py

@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '6.29.0'
+version = '6.29.1'
 # The full version, including alpha/beta/rc tags.
-release = '6.29.0'
+release = '6.29.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.