Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly support extended world heights (y > 255) in tripleBlockCoord (#1805)

Browse Source
This commit is contained in:
Jordan 2022-06-17 15:39:27 +01:00 committed by GitHub
parent 5b72f396bb
commit d2b4154cc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
worldedit-core/src/main/java/com/fastasyncworldedit/core/util/MathMan.java
View File

@ -167,9 +167,20 @@ public class MathMan {
return (((triple >> 40) & 0xffffff) << 38) >> 38; return (((triple >> 40) & 0xffffff) << 38) >> 38;
} }
/**
* Pack a chunk-block coordinate into an int. Supports x and z 0 -> 15 and y = -2048 -> 2047
*
* @param x x coordinate
* @param y y coordinate
* @param z z coordinate
* @return int packed by x, y and z coordinates
*/
public static int tripleBlockCoord(int x, int y, int z) { public static int tripleBlockCoord(int x, int y, int z) {
// account for the fact y can be negative now. Assume it won't be less than -256 // We have 12 bits available to Y value, so keep it 0 -> 4095
y += 256; if (y < -2048 || y > 2047) {
throw new UnsupportedOperationException("TripleBlockCoord Y value cannot be outside range -2048 <= y <= 2047");
}
y += 2048;
return ((x & 15) << 16 | (z & 15) << 12 | y); return ((x & 15) << 16 | (z & 15) << 12 | y);
} }
@ -182,7 +193,7 @@ public class MathMan {
} }
public static int untripleBlockCoordY(int triple) { public static int untripleBlockCoordY(int triple) {
return (triple & 0x1ff) - 256; return (triple & 0xfff) - 2048;
} }
public static int untripleBlockCoordZ(int triple) { public static int untripleBlockCoordZ(int triple) {