diff --git a/nms/v1_21R4/build.gradle.kts b/nms/v1_21R4/build.gradle.kts
index 03a57d5..dcd0a7e 100644
--- a/nms/v1_21R4/build.gradle.kts
+++ b/nms/v1_21R4/build.gradle.kts
@@ -3,18 +3,15 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 group = rootProject.group
 version = rootProject.version
 
-//TODO uncomment when paperDevBundle 1.21.4 release
-/*plugins {
+plugins {
     id("io.papermc.paperweight.userdev")
-}*/
+}
 
 dependencies {
     implementation(project(":nms:nms-common"))
 
     // Used for nms
-    compileOnly("org.spigotmc:spigot-api:1.20.5-R0.1-SNAPSHOT") //TODO remove when paperDevBundle 1.21.5 release
-    compileOnly("org.spigotmc:spigot:1.21.5-R0.1-SNAPSHOT") //TODO remove when paperDevBundle 1.21.5 release
-    //paperweight.paperDevBundle("1.21.5-R0.1-SNAPSHOT") //TODO uncomment when paperDevBundle 1.21.5 release
+    paperweight.paperDevBundle("1.21.5-no-moonrise-SNAPSHOT")
 }
 
 repositories {
diff --git a/nms/v1_21R4/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_21R4_PacketManager.kt b/nms/v1_21R4/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_21R4_PacketManager.kt
index cab0852..b123625 100644
--- a/nms/v1_21R4/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_21R4_PacketManager.kt
+++ b/nms/v1_21R4/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_21R4_PacketManager.kt
@@ -1,8 +1,8 @@
 package xyz.alexcrea.cuanvil.dependency.packet.versions
 
-import net.minecraft.network.protocol.game.PacketPlayOutAbilities
-import net.minecraft.world.entity.player.PlayerAbilities
-import org.bukkit.craftbukkit.v1_21_R4.entity.CraftPlayer
+import net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket
+import net.minecraft.world.entity.player.Abilities
+import org.bukkit.craftbukkit.entity.CraftPlayer
 import org.bukkit.entity.Player
 import xyz.alexcrea.cuanvil.dependency.packet.PacketManager
 import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase
@@ -13,22 +13,21 @@ class V1_21R4_PacketManager : PacketManagerBase(), PacketManager {
 
     override fun setInstantBuild(player: Player, instantBuild: Boolean) {
         val nmsPlayer = (player as CraftPlayer).handle
-        val playerAbilities: PlayerAbilities = nmsPlayer.gk()
-        val sendedAbilities: PlayerAbilities
-
-        if (playerAbilities.d == instantBuild) {
+        val playerAbilities = nmsPlayer.abilities
+        val sendedAbilities: Abilities
+        if (playerAbilities.instabuild == instantBuild) {
             sendedAbilities = playerAbilities
         } else {
-            sendedAbilities = PlayerAbilities()
-            sendedAbilities.a = playerAbilities.a
-            sendedAbilities.b = playerAbilities.b
-            sendedAbilities.c = playerAbilities.c
-            sendedAbilities.d = instantBuild
-            sendedAbilities.e = playerAbilities.e
-            sendedAbilities.m = playerAbilities.m
-            sendedAbilities.n = playerAbilities.n
+            sendedAbilities = Abilities()
+            sendedAbilities.invulnerable = playerAbilities.invulnerable
+            sendedAbilities.flying = playerAbilities.flying
+            sendedAbilities.mayfly = playerAbilities.mayfly
+            sendedAbilities.instabuild = instantBuild
+            sendedAbilities.mayBuild = playerAbilities.mayBuild
+            sendedAbilities.flyingSpeed = playerAbilities.flyingSpeed
+            sendedAbilities.walkingSpeed = playerAbilities.walkingSpeed
         }
-        val packet = PacketPlayOutAbilities(sendedAbilities)
-        nmsPlayer.f.sendPacket(packet)
+        val packet = ClientboundPlayerAbilitiesPacket(sendedAbilities)
+        nmsPlayer.connection.send(packet)
     }
 }