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

Fix #1143

Browse Source
This commit is contained in:
dordsor21 2021-09-21 17:18:49 +01:00
parent 3617a29ba8
commit c805102819
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
1 changed files with 19 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
worldedit-core/src/main/java/com/sk89q/worldedit/math/convolution/HeightMap.java
View File

@ -45,7 +45,6 @@ public class HeightMap {
//FAWE start //FAWE start
private final boolean layers; private final boolean layers;
private boolean[] invalid;
//FAWE end //FAWE end
private final int[] data; private final int[] data;
private final int width; private final int width;
@ -89,7 +88,6 @@ public class HeightMap {
// Store current heightmap data // Store current heightmap data
data = new int[width * height]; data = new int[width * height];
invalid = new boolean[data.length];
//FAWE start //FAWE start
if (layers) { if (layers) {
@ -108,44 +106,13 @@ public class HeightMap {
} else { } else {
// Store current heightmap data // Store current heightmap data
int index = 0; int index = 0;
int yTmp = session.getMaxY(); for (int z = 0; z < height; z++) {
for (int z = 0; z < height; ++z) { for (int x = 0; x < width; x++, index++) {
for (int x = 0; x < width; ++x, index++) { if (mask == null) {
if (mask != null) { data[index] = session.getHighestTerrainBlock(x + minX, z + minZ, minY, maxY);
yTmp = session.getNearestSurfaceTerrainBlock(
x + minX,
z + minZ,
yTmp,
minY,
maxY,
Integer.MIN_VALUE,
Integer.MAX_VALUE,
mask
);
} else { } else {
yTmp = session.getNearestSurfaceTerrainBlock( data[index] = session.getHighestTerrainBlock(x + minX, z + minZ, minY, maxY, mask);
x + minX,
z + minZ,
yTmp,
minY,
maxY,
Integer.MIN_VALUE,
Integer.MAX_VALUE
);
} }
switch (yTmp) {
case Integer.MIN_VALUE:
yTmp = minY;
invalid[index] = true;
break;
case Integer.MAX_VALUE:
yTmp = maxY;
invalid[index] = true;
break;
default:
break;
}
data[index] = yTmp;
} }
} }
} }
@ -209,9 +176,6 @@ public class HeightMap {
for (int z = 0; z < height; ++z) { for (int z = 0; z < height; ++z) {
int zr = z + originZ; int zr = z + originZ;
for (int x = 0; x < width; ++x) { for (int x = 0; x < width; ++x) {
if (this.invalid != null && this.invalid[index]) {
continue;
}
int curHeight = this.data[index]; int curHeight = this.data[index];
//Clamp newHeight within the selection area //Clamp newHeight within the selection area
@ -302,10 +266,6 @@ public class HeightMap {
for (int z = 0; z < height; ++z) { for (int z = 0; z < height; ++z) {
int zr = z + originZ; int zr = z + originZ;
for (int x = 0; x < width; ++x, index++) { for (int x = 0; x < width; ++x, index++) {
if (this.invalid != null && this.invalid[index]) {
continue;
}
int curHeight = this.data[index]; int curHeight = this.data[index];
// Clamp newHeight within the selection area // Clamp newHeight within the selection area
@ -339,6 +299,20 @@ public class HeightMap {
++blocksChanged; ++blocksChanged;
} }
} else if (curHeight > newHeight) { } else if (curHeight > newHeight) {
for (int setY = originY, getY = newHeight; setY >= newHeight; setY++, getY++) {
BlockState get;
if (getY >= session.getMinY() && getY <= session.getMaxY()) {
get = session.getBlock(xr, getY, zr);
} else {
get = BlockTypes.AIR.getDefaultState();
}
if (get != BlockTypes.AIR.getDefaultState()) {
tmpBlock = get;
}
session.setBlock(xr, setY, zr, tmpBlock);
++blocksChanged;
}
// Set the top block of the column to be the same type // Set the top block of the column to be the same type
// (this could otherwise go wrong with rounding) // (this could otherwise go wrong with rounding)
session.setBlock(xr, newHeight, zr, session.getBlock(xr, curHeight, zr)); session.setBlock(xr, newHeight, zr, session.getBlock(xr, curHeight, zr));