Merge pull request #430 from Shynixn/development

Merge changes to Master --release
Shynixn · May 6, 2022 · 64be6b7 · 64be6b7
2 parents 091f26f + aa3d449
commit 64be6b7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/Dockerfile b/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.2
+ENV PLUGIN_VERSION=6.29.3
 # Change to the server version you want to test.
 ENV SERVER_VERSION=spigot-1.18.jar
 # Port of the Minecraft Server.

diff --git a/.../main/java/com/github/shynixn/blockball/bukkit/logic/business/service/ProxyServiceImpl.kt b/.../main/java/com/github/shynixn/blockball/bukkit/logic/business/service/ProxyServiceImpl.kt
@@ -249,7 +249,12 @@ class ProxyServiceImpl @Inject constructor(
      */
     override fun <P> setPlayerFlying(player: P, enabled: Boolean) {
         require(player is Player)
-        player.isFlying = enabled
+
+        if (enabled) {
+            player.isFlying = player.allowFlight
+        } else {
+            player.isFlying = false
+        }
     }
 
     /**
@@ -520,11 +525,12 @@ class ProxyServiceImpl @Inject constructor(
                 val chatComponent =
                     clazz.getDeclaredMethod("a", String::class.java).invoke(null, chatBuilder.toString())
                 val systemUtilsClazz = findClazz("net.minecraft.SystemUtils")
-                val defaultUUID = if(pluginProxy.getServerVersion().isVersionSameOrGreaterThan(Version.VERSION_1_18_R2)){
-                    systemUtilsClazz.getDeclaredField("c").get(null) as UUID
-                }else{
-                    systemUtilsClazz.getDeclaredField("b").get(null) as UUID
-                }
+                val defaultUUID =
+                    if (pluginProxy.getServerVersion().isVersionSameOrGreaterThan(Version.VERSION_1_18_R2)) {
+                        systemUtilsClazz.getDeclaredField("c").get(null) as UUID
+                    } else {
+                        systemUtilsClazz.getDeclaredField("b").get(null) as UUID
+                    }
                 val chatEnumMessage = findClazz("net.minecraft.network.chat.ChatMessageType")
                 packetClazz.getDeclaredConstructor(chatBaseComponentClazz, chatEnumMessage, UUID::class.java)
                     .newInstance(chatComponent, chatEnumMessage.enumConstants[0], defaultUUID)
@@ -650,8 +656,7 @@ class ProxyServiceImpl @Inject constructor(
                 .accessible(true)
                 .get(null) as AtomicInteger
             atomicInteger.incrementAndGet()
-        }
-        else if (pluginProxy.getServerVersion().isVersionSameOrGreaterThan(Version.VERSION_1_17_R1)) {
+        } else if (pluginProxy.getServerVersion().isVersionSameOrGreaterThan(Version.VERSION_1_17_R1)) {
             val atomicInteger = findClazz("net.minecraft.world.entity.Entity")
                 .getDeclaredField("b")
                 .accessible(true)

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.29.2
+version: 6.29.3
 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.29.2'
+    version '6.29.3'
 
     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.29.2'
+version = '6.29.3'
 # The full version, including alpha/beta/rc tags.
-release = '6.29.2'
+release = '6.29.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.