Skip to content

1.21.6 #749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TylerS1066 merged 4 commits into from
Jun 28, 2025
Merged

1.21.6 #749

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d417944
merge upstream
invalid-email-address Jun 21, 2025
1d791aa
merge upstream
invalid-email-address Jun 21, 2025
fbc7178
Update to 1.21.6 and replace deprecated teleport flags in ISmoothTele…
invalid-email-address Jun 22, 2025
461e76e
Changed to support only one version
invalid-email-address Jun 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion v1_21/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion v1_21/src/main/java/net/countercraft/movecraft/compat/v1_21/IWorldHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.5") && !version.equals("1.21.6"))
throw new IllegalStateException("Movecraft is not compatible with this version of Minecraft: " + version);
}

Expand Down
10 changes: 5 additions & 5 deletions v1_21/src/main/java/net/countercraft/movecraft/support/v1_21/ISmoothTeleport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading