1.21.6 (#749)

* merge upstream

* Update to 1.21.6 and replace deprecated teleport flags in ISmoothTeleport

* Changed to support only one version

Author: eirikh1996

v1_21/build.gradle.kts

@@ -7,7 +7,7 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 dependencies {
     api(project(":movecraft-api"))
-    paperweight.paperDevBundle("1.21.5-R0.1-SNAPSHOT")
+    paperweight.paperDevBundle("1.21.6-R0.1-SNAPSHOT")
 }
 
 description = "Movecraft-v1_21"

v1_21/src/main/java/net/countercraft/movecraft/compat/v1_21/IWorldHandler.java

@@ -52,7 +52,7 @@ public class IWorldHandler extends WorldHandler {
 
     public IWorldHandler() {
         String version = Bukkit.getServer().getMinecraftVersion();
-        if (!version.equals("1.21.5"))
+        if (!version.equals("1.21.6"))
             throw new IllegalStateException("Movecraft is not compatible with this version of Minecraft: " + version);
     }
 

v1_21/src/main/java/net/countercraft/movecraft/support/v1_21/ISmoothTeleport.java

@@ -10,11 +10,11 @@ public class ISmoothTeleport extends SmoothTeleport {
     public void teleport(@NotNull Player player, @NotNull Location location) {
         player.teleport(
                 location,
-                TeleportFlag.Relative.X,
-                TeleportFlag.Relative.Y,
-                TeleportFlag.Relative.Z,
-                TeleportFlag.Relative.PITCH,
-                TeleportFlag.Relative.YAW,
+                TeleportFlag.Relative.VELOCITY_X,//x
+                TeleportFlag.Relative.VELOCITY_Y,//y
+                TeleportFlag.Relative.VELOCITY_Z,//z
+                TeleportFlag.Relative.VELOCITY_ROTATION,//pitch
+                TeleportFlag.Relative.VELOCITY_ROTATION,//yaw
                 TeleportFlag.EntityState.RETAIN_OPEN_INVENTORY,
                 TeleportFlag.EntityState.RETAIN_VEHICLE,
                 TeleportFlag.EntityState.RETAIN_PASSENGERS