Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-04 12:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various debugging and cleaning

Browse Source
This commit is contained in:
MattBDev
2020-01-03 12:02:18 -05:00
parent a5ee0b197d
commit cfb6e3bca4
21 changed files with 247 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
worldedit-core/src/main/java/com/sk89q/worldedit/regions/ConvexPolyhedralRegion.java
View File

@ -69,7 +69,7 @@ public class ConvexPolyhedralRegion extends AbstractRegion {
private BlockVector3 centerAccum = BlockVector3.ZERO;
/**
* The last triangle that caused a {@link #contains(Vector3)} to classify a point as "outside". Used for optimization.
* The last triangle that caused a {@link #contains(BlockVector3)} to classify a point as "outside". Used for optimization.
*/
private Triangle lastTriangle;
@ -196,7 +196,7 @@ public class ConvexPolyhedralRegion extends AbstractRegion {
}
if (!vertexBacklog.isEmpty()) {
// Remove the new vertex
// Remove the new vertex
vertices.remove(vertex);
// Clone, clear and work through the backlog
@ -226,7 +226,7 @@ public class ConvexPolyhedralRegion extends AbstractRegion {
public BlockVector3 getMaximumPoint() {
return maximumPoint;
}
@Override
public Vector3 getCenter() {
return centerAccum.toVector3().divide(vertices.size());

40
worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java
View File

@ -49,10 +49,7 @@ import org.jetbrains.annotations.NotNull;
public class CuboidRegion extends AbstractRegion implements FlatRegion {
private boolean useOldIterator;
private int minX, minY, minZ, maxX, maxY, maxZ;
private BlockVector3 min;
private BlockVector3 max;
private BlockVector3 pos1;
private BlockVector3 pos2;
@ -82,10 +79,6 @@ public class CuboidRegion extends AbstractRegion implements FlatRegion {
recalculate();
}
public void setUseOldIterator(boolean useOldIterator) {
this.useOldIterator = useOldIterator;
}
/**
* Get the first cuboid-defining corner.
*
@ -139,8 +132,6 @@ public class CuboidRegion extends AbstractRegion implements FlatRegion {
maxX = Math.max(pos1.getX(), pos2.getX());
maxY = Math.max(pos1.getY(), pos2.getY());
maxZ = Math.max(pos1.getZ(), pos2.getZ());
this.min = BlockVector3.at(minX, minY, minZ);
this.max = BlockVector3.at(maxX, maxY, maxZ);
}
/**
@ -188,12 +179,22 @@ public class CuboidRegion extends AbstractRegion implements FlatRegion {
@Override
public BlockVector3 getMinimumPoint() {
return min;
return pos1.getMinimum(pos2);
}
@Override
public BlockVector3 getMaximumPoint() {
return max;
return pos1.getMaximum(pos2);
}
@Override
public int getMinimumY() {
return minY;
}
@Override
public int getMaximumY() {
return maxY;
}
@Override
@ -448,7 +449,7 @@ public class CuboidRegion extends AbstractRegion implements FlatRegion {
@Override
public Iterator<BlockVector3> iterator() {
if (Settings.IMP.HISTORY.COMPRESSION_LEVEL >= 9 || useOldIterator) {
if (Settings.IMP.HISTORY.COMPRESSION_LEVEL >= 9) {
return iterator_old();
}
return new Iterator<BlockVector3>() {
@ -644,16 +645,6 @@ public class CuboidRegion extends AbstractRegion implements FlatRegion {
return new CuboidRegion(origin.subtract(size), origin.add(size));
}
@Override
public int getMinimumY() {
return minY;
}
@Override
public int getMaximumY() {
return maxY;
}
public int getMinimumX() {
return minX;
}
@ -724,7 +715,7 @@ public class CuboidRegion extends AbstractRegion implements FlatRegion {
trimNBT(set, this::contains);
return set;
}
else if (tx >= minX && bx <= maxX && tz >= minZ && bz <= maxZ) {
if (tx >= minX && bx <= maxX && tz >= minZ && bz <= maxZ) {
trimY(set, minY, maxY);
final int lowerX = Math.max(0, minX - bx);
final int upperX = Math.min(15, 15 + maxX - tx);
@ -781,9 +772,8 @@ public class CuboidRegion extends AbstractRegion implements FlatRegion {
}
trimNBT(set, this::contains);
return set;
} else {
return null;
}
return null;
}