Brandon
/
FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/boy0001/FastAsyncWorldedit

This commit is contained in:
Jesse Boyd 2018-02-27 01:58:29 +11:00
parent 77cf4ec34c 61f3dcaacc
commit d450b8f0bc
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/boydti/fawe/object/function/SurfaceRegionFunction.java
View File

@ -27,7 +27,7 @@ public class SurfaceRegionFunction implements FlatRegionFunction {
public boolean apply(Vector2D position) throws WorldEditException { public boolean apply(Vector2D position) throws WorldEditException {
int x = position.getBlockX(); int x = position.getBlockX();
int z = position.getBlockZ(); int z = position.getBlockZ();
int layer = extent.getNearestSurfaceTerrainBlock(x, z, lastY, minY, maxY); int layer = extent.getNearestSurfaceTerrainBlock(x, z, lastY, minY, maxY, false);
if (layer != -1) { if (layer != -1) {
lastY = layer; lastY = layer;
return function.apply(mutable.setComponents(x, layer, z)); return function.apply(mutable.setComponents(x, layer, z));

15
core/src/main/java/com/sk89q/worldedit/extent/Extent.java
View File

@ -163,11 +163,19 @@ public interface Extent extends InputExtent, OutputExtent {
return (state ? minY : maxY) << 4; return (state ? minY : maxY) << 4;
} }
public default int getNearestSurfaceTerrainBlock(int x, int z, int y, int minY, int maxY, boolean ignoreAir) {
return getNearestSurfaceTerrainBlock(x, z, y, minY, maxY, minY, maxY, ignoreAir);
}
public default int getNearestSurfaceTerrainBlock(int x, int z, int y, int minY, int maxY) { public default int getNearestSurfaceTerrainBlock(int x, int z, int y, int minY, int maxY) {
return getNearestSurfaceTerrainBlock(x, z, y, minY, maxY, minY, maxY); return getNearestSurfaceTerrainBlock(x, z, y, minY, maxY, minY, maxY);
} }
public default int getNearestSurfaceTerrainBlock(int x, int z, int y, int minY, int maxY, int failedMin, int failedMax) { public default int getNearestSurfaceTerrainBlock(int x, int z, int y, int minY, int maxY, int failedMin, int failedMax) {
return getNearestSurfaceTerrainBlock(x, z, y, minY, maxY, failedMin, failedMax, true);
}
public default int getNearestSurfaceTerrainBlock(int x, int z, int y, int minY, int maxY, int failedMin, int failedMax, boolean ignoreAir) {
y = Math.max(minY, Math.min(maxY, y)); y = Math.max(minY, Math.min(maxY, y));
int clearanceAbove = maxY - y; int clearanceAbove = maxY - y;
int clearanceBelow = y - minY; int clearanceBelow = y - minY;
@ -196,7 +204,12 @@ public interface Extent extends InputExtent, OutputExtent {
} }
} }
} }
return state ? failedMin : failedMax; int result = state ? failedMin : failedMax;
if(result > 0 && !ignoreAir) {
block = getLazyBlock(x, result, z);
return block.isAir() ? -1 : result;
}
return result;
} }
default public void addCaves(Region region) throws WorldEditException { default public void addCaves(Region region) throws WorldEditException {