Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-07-04 18:35:28 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/new-block-api' into new-block-api

Browse Source
This commit is contained in:
TheMode 2021-08-11 16:16:01 +02:00
commit 5714d9db79
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/minestom/server/instance/Section.java
View File

@ -20,14 +20,14 @@ public class Section implements PublicCloneable<Section> {
} }
public short getBlockAt(int x, int y, int z) { public short getBlockAt(int x, int y, int z) {
x = toChunkCoordinate(x); x = toChunkRelativeCoordinate(x);
z = toChunkCoordinate(z); z = toChunkRelativeCoordinate(z);
return palette.getBlockAt(x, y, z); return palette.getBlockAt(x, y, z);
} }
public void setBlockAt(int x, int y, int z, short blockId) { public void setBlockAt(int x, int y, int z, short blockId) {
x = toChunkCoordinate(x); x = toChunkRelativeCoordinate(x);
z = toChunkCoordinate(z); z = toChunkRelativeCoordinate(z);
palette.setBlockAt(x, y, z, blockId); palette.setBlockAt(x, y, z, blockId);
} }
@ -65,12 +65,12 @@ public class Section implements PublicCloneable<Section> {
} }
/** /**
* Converts a world coordinate to a chunk one. * Returns a coordinate that is relative to a chunk the provided coordinate is in.
* *
* @param xz the world coordinate * @param xz the world coordinate
* @return the chunk coordinate of {@code xz} * @return a coordinate relative to the closest chunk
*/ */
private static int toChunkCoordinate(int xz) { private static int toChunkRelativeCoordinate(int xz) {
xz %= 16; xz %= 16;
if (xz < 0) { if (xz < 0) {
xz += Chunk.CHUNK_SECTION_SIZE; xz += Chunk.CHUNK_SECTION_SIZE;