Skip to content
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

1.21.4 world handler #723

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

1.21.4 world handler #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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.1-R0.1-SNAPSHOT")
paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT")
}

description = "Movecraft-v1_21"
Expand Down
7 changes: 4 additions & 3 deletions 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
@@ -1,5 +1,6 @@
package net.countercraft.movecraft.compat.v1_21;

import ca.spottedleaf.moonrise.common.util.WorldUtil;
import net.countercraft.movecraft.MovecraftLocation;
import net.countercraft.movecraft.MovecraftRotation;
import net.countercraft.movecraft.WorldHandler;
Expand Down Expand Up @@ -51,7 +52,7 @@ public class IWorldHandler extends WorldHandler {

public IWorldHandler() {
String version = Bukkit.getServer().getMinecraftVersion();
if (!version.equals("1.21.1"))
if (!version.equals("1.21.4"))
throw new IllegalStateException("Movecraft is not compatible with this version of Minecraft: " + version);
}

Expand Down Expand Up @@ -237,7 +238,7 @@ private BlockPos locationToPosition(@NotNull MovecraftLocation loc) {

private void setBlockFast(@NotNull Level world, @NotNull BlockPos position, @NotNull BlockState data) {
LevelChunk chunk = world.getChunkAt(position);
int chunkSection = (position.getY() >> 4) - chunk.getMinSection();
int chunkSection = (position.getY() >> 4) - WorldUtil.getMinSection(chunk.getLevel());
LevelChunkSection section = chunk.getSections()[chunkSection];
if (section == null) {
// Put a GLASS block to initialize the section. It will be replaced next with the real block.
Expand All @@ -251,7 +252,7 @@ private void setBlockFast(@NotNull Level world, @NotNull BlockPos position, @Not
section.setBlockState(position.getX() & 15, position.getY() & 15, position.getZ() & 15, data);
world.sendBlockUpdated(position, data, data, 3);
world.getLightEngine().checkBlock(position); // boolean corresponds to if chunk section empty
chunk.setUnsaved(true);
chunk.markUnsaved();
}

@Override
Expand Down