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

Added pattern support to /replacenear, //walls, and //faces

Browse Source
This commit is contained in:
zml2008
2011-08-21 23:55:50 -07:00
parent 9e13e25760
commit 91b7b8444f
3 changed files with 140 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/sk89q/worldedit/commands/RegionCommands.java
View File

@ -159,8 +159,13 @@ public class RegionCommands {
LocalSession session, LocalPlayer player, EditSession editSession)
throws WorldEditException {
BaseBlock block = we.getBlock(player, args.getString(0));
int affected = editSession.makeCuboidWalls(session.getSelection(player.getWorld()), block);
Pattern pattern = we.getBlockPattern(player, args.getString(0));
int affected;
if (pattern instanceof SingleBlockPattern) {
affected = editSession.makeCuboidWalls(session.getSelection(player.getWorld()), ((SingleBlockPattern) pattern).getBlock());
} else {
affected = editSession.makeCuboidWalls(session.getSelection(player.getWorld()), pattern);
}
player.print(affected + " block(s) have been changed.");
}
@ -177,9 +182,15 @@ public class RegionCommands {
public static void faces(CommandContext args, WorldEdit we,
LocalSession session, LocalPlayer player, EditSession editSession)
throws WorldEditException {
Pattern pattern = we.getBlockPattern(player, args.getString(0));
int affected;
if (pattern instanceof SingleBlockPattern) {
affected = editSession.makeCuboidFaces(session.getSelection(player.getWorld()), ((SingleBlockPattern) pattern).getBlock());
} else {
affected = editSession.makeCuboidFaces(session.getSelection(player.getWorld()), pattern);
}
BaseBlock block = we.getBlock(player, args.getString(0));
int affected = editSession.makeCuboidFaces(session.getSelection(player.getWorld()), block);
player.print(affected + " block(s) have been changed.");
}

13
src/main/java/com/sk89q/worldedit/commands/UtilityCommands.java
View File

@ -238,14 +238,15 @@ public class UtilityCommands {
throws WorldEditException {
int size = Math.max(1, args.getInteger(0));
int affected;
Set<Integer> from;
BaseBlock to;
Pattern to;
if (args.argsLength() == 2) {
from = null;
to = we.getBlock(player, args.getString(1));
to = we.getBlockPattern(player, args.getString(1));
} else {
from = we.getBlockIDs(player, args.getString(1), true);
to = we.getBlock(player, args.getString(2));
to = we.getBlockPattern(player, args.getString(2));
}
Vector base = session.getPlacementPosition(player);
@ -253,7 +254,11 @@ public class UtilityCommands {
Vector max = base.add(size, size, size);
Region region = new CuboidRegion(min, max);
int affected = editSession.replaceBlocks(region, from, to);
if (to instanceof SingleBlockPattern) {
affected = editSession.replaceBlocks(region, from, ((SingleBlockPattern) to).getBlock());
} else {
affected = editSession.replaceBlocks(region, from, to);
}
player.print(affected + " block(s) have been replaced.");
}