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

Made //deform round the results before lookup and fixed some potential issues.

Browse Source
This commit is contained in:
TomyLobo 2011-11-02 03:39:02 +01:00
parent 2edf3559d8
commit 187896c5ed
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2674,19 +2674,35 @@ public class EditSession {
final RValue y = expression.getVariable("y"); final RValue y = expression.getVariable("y");
final RValue z = expression.getVariable("z"); final RValue z = expression.getVariable("z");
int affected = 0; Vector zero2 = zero.add(0.5, 0.5, 0.5);
final DoubleArrayList<BlockVector, BaseBlock> queue = new DoubleArrayList<BlockVector, BaseBlock>(false);
for (BlockVector position : region) { for (BlockVector position : region) {
// offset, scale
final Vector scaled = position.subtract(zero).divide(unit); final Vector scaled = position.subtract(zero).divide(unit);
// transform
expression.evaluate(scaled.getX(), scaled.getY(), scaled.getZ()); expression.evaluate(scaled.getX(), scaled.getY(), scaled.getZ());
final Vector sourceScaled = new Vector(x.getValue(), y.getValue(), z.getValue()); final Vector sourceScaled = new Vector(x.getValue(), y.getValue(), z.getValue());
final BlockVector sourcePosition = sourceScaled.multiply(unit).add(zero).toBlockPoint(); // unscale, unoffset, round-nearest
final BlockVector sourcePosition = sourceScaled.multiply(unit).add(zero2).toBlockPoint();
// read block from world
BaseBlock material = new BaseBlock(world.getBlockType(sourcePosition), world.getBlockData(sourcePosition)); BaseBlock material = new BaseBlock(world.getBlockType(sourcePosition), world.getBlockData(sourcePosition));
// queue operation
queue.put(position, material);
}
int affected = 0;
for (Map.Entry<BlockVector, BaseBlock> entry : queue) {
BlockVector position = entry.getKey();
BaseBlock material = entry.getValue();
// set at new position
if (setBlock(position, material)) { if (setBlock(position, material)) {
++affected; ++affected;
} }