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 /green break on liquids.

Browse Source
This commit is contained in:
TomyLobo 2011-12-10 12:16:57 +01:00
parent cf69daff78
commit 3dabcdacd1
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2361,35 +2361,45 @@ public class EditSession {
public int green(Vector pos, double radius) public int green(Vector pos, double radius)
throws MaxChangedBlocksException { throws MaxChangedBlocksException {
int affected = 0; int affected = 0;
double radiusSq = radius * radius; final double radiusSq = radius * radius;
int ox = pos.getBlockX(); final int ox = pos.getBlockX();
int oy = pos.getBlockY(); final int oy = pos.getBlockY();
int oz = pos.getBlockZ(); final int oz = pos.getBlockZ();
BaseBlock grass = new BaseBlock(BlockID.GRASS); final BaseBlock grass = new BaseBlock(BlockID.GRASS);
int ceilRadius = (int) Math.ceil(radius); final int ceilRadius = (int) Math.ceil(radius);
for (int x = ox - ceilRadius; x <= ox + ceilRadius; ++x) { for (int x = ox - ceilRadius; x <= ox + ceilRadius; ++x) {
for (int z = oz - ceilRadius; z <= oz + ceilRadius; ++z) { for (int z = oz - ceilRadius; z <= oz + ceilRadius; ++z) {
if ((new Vector(x, oy, z)).distanceSq(pos) > radiusSq) { if ((new Vector(x, oy, z)).distanceSq(pos) > radiusSq) {
continue; continue;
} }
for (int y = 127; y >= 1; --y) { loop: for (int y = 127; y >= 1; --y) {
Vector pt = new Vector(x, y, z); final Vector pt = new Vector(x, y, z);
int id = getBlockType(pt); final int id = getBlockType(pt);
if (BlockType.canPassThrough(id)) { switch (id) {
continue; case BlockID.DIRT:
}
if (id == BlockID.DIRT) {
if (setBlock(pt, grass)) { if (setBlock(pt, grass)) {
++affected; ++affected;
} }
break loop;
case BlockID.WATER:
case BlockID.STATIONARY_WATER:
case BlockID.LAVA:
case BlockID.STATIONARY_LAVA:
// break on liquids...
break loop;
default:
// ...and all non-passable blocks
if (!BlockType.canPassThrough(id)) {
break loop;
}
} }
break;
} }
} }
} }