Should fix #1237 and should fix #1236

This commit is contained in:
dordsor21 2021-08-26 16:44:49 +01:00
parent cacfcb8c5c
commit ebc38a62ad
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B

View File

@ -752,7 +752,9 @@ public class CuboidRegion extends AbstractRegion implements FlatRegion {
return set; return set;
} }
if (tx >= minX && bx <= maxX && tz >= minZ && bz <= maxZ) { if (tx >= minX && bx <= maxX && tz >= minZ && bz <= maxZ) {
trimY(set, minY, maxY); if (minY > set.getMinSectionIndex() << 4 || maxY < (set.getMaxSectionIndex() << 4) + 15) {
trimY(set, minY, maxY);
}
final int lowerX = Math.max(0, minX - bx); final int lowerX = Math.max(0, minX - bx);
final int upperX = Math.min(15, 15 + maxX - tx); final int upperX = Math.min(15, 15 + maxX - tx);
@ -770,7 +772,7 @@ public class CuboidRegion extends AbstractRegion implements FlatRegion {
char[] arr = set.load(layer); char[] arr = set.load(layer);
if (trimX || trimZ) { if (trimX || trimZ) {
int indexY = 0; int indexY = 0;
for (int y = getWorldMinY(); y < 16; y++, indexY += getWorldMaxY()) { for (int y = 0; y < 16; y++, indexY += 256) { // For each y layer within a chunk section
int index; int index;
if (trimZ) { if (trimZ) {
index = indexY; index = indexY;