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

Made CuboidRegions in EditSession clamp Y to world.

Browse Source
This commit is contained in:
sk89q 2014-03-27 20:57:20 -07:00
parent d9ad0014f0
commit 570b4ebd93
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/sk89q/worldedit/EditSession.java
View File

@ -845,6 +845,7 @@ public class EditSession {
checkArgument(height >= 1, "height >= 1"); checkArgument(height >= 1, "height >= 1");
Region region = new CuboidRegion( Region region = new CuboidRegion(
getWorld(), // Causes clamping of Y range
position.add(-apothem + 1, 0, -apothem + 1), position.add(-apothem + 1, 0, -apothem + 1),
position.add(apothem - 1, height - 1, apothem - 1)); position.add(apothem - 1, height - 1, apothem - 1));
Pattern pattern = new SingleBlockPattern(new BaseBlock(BlockID.AIR)); Pattern pattern = new SingleBlockPattern(new BaseBlock(BlockID.AIR));
@ -866,6 +867,7 @@ public class EditSession {
checkArgument(height >= 1, "height >= 1"); checkArgument(height >= 1, "height >= 1");
Region region = new CuboidRegion( Region region = new CuboidRegion(
getWorld(), // Causes clamping of Y range
position.add(-apothem + 1, 0, -apothem + 1), position.add(-apothem + 1, 0, -apothem + 1),
position.add(apothem - 1, -height + 1, apothem - 1)); position.add(apothem - 1, -height + 1, apothem - 1));
Pattern pattern = new SingleBlockPattern(new BaseBlock(BlockID.AIR)); Pattern pattern = new SingleBlockPattern(new BaseBlock(BlockID.AIR));
@ -887,7 +889,10 @@ public class EditSession {
Mask mask = new FuzzyBlockMask(new BaseBlock(blockType, -1)); Mask mask = new FuzzyBlockMask(new BaseBlock(blockType, -1));
Vector adjustment = new Vector(1, 1, 1).multiply(apothem - 1); Vector adjustment = new Vector(1, 1, 1).multiply(apothem - 1);
Region region = new CuboidRegion(position.add(adjustment.multiply(-1)), position.add(adjustment)); Region region = new CuboidRegion(
getWorld(), // Causes clamping of Y range
position.add(adjustment.multiply(-1)),
position.add(adjustment));
Pattern pattern = new SingleBlockPattern(new BaseBlock(BlockID.AIR)); Pattern pattern = new SingleBlockPattern(new BaseBlock(BlockID.AIR));
return replaceBlocks(region, mask, pattern); return replaceBlocks(region, mask, pattern);
} }
@ -2175,7 +2180,10 @@ public class EditSession {
generator.setPlant(GardenPatchGenerator.getPumpkinPattern()); generator.setPlant(GardenPatchGenerator.getPumpkinPattern());
// In a region of the given radius // In a region of the given radius
Region region = new CuboidRegion(position.add(-apothem, -5, -apothem), position.add(apothem, 10, apothem)); Region region = new CuboidRegion(
getWorld(), // Causes clamping of Y range
position.add(-apothem, -5, -apothem),
position.add(apothem, 10, apothem));
// And we want to scatter them // And we want to scatter them
GroundScatterFunction scatter = new GroundScatterFunction(this, generator); GroundScatterFunction scatter = new GroundScatterFunction(this, generator);