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

Add coordinate argument to //chunk command.

Browse Source
This commit is contained in:
wizjany 2013-06-03 15:54:49 -04:00
parent 10c43a9c9f
commit fb96ced3bf
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/sk89q/worldedit/commands/SelectionCommands.java
View File

@ -193,15 +193,19 @@ public class SelectionCommands {
@Command(
aliases = { "/chunk" },
usage = "",
flags = "s",
usage = "[x,z coordinates]",
flags = "sc",
desc = "Set the selection to your current chunk.",
help =
"Set the selection to the chunk you are currently in.\n" +
"With the -s flag, your current selection is expanded\n" +
"to encompass all chunks that are part of it.",
"to encompass all chunks that are part of it.\n\n" +
"Specifying coordinates will use those instead of your\n"+
"current position. Use -c to specify chunk coordinates,\n" +
"otherwise full coordinates will be implied.\n" +
"(for example, the coordinates 5,5 are the same as -c 0,0)",
min = 0,
max = 0
max = 1
)
@Logging(POSITION)
@CommandPermissions("worldedit.selection.chunk")
@ -224,7 +228,21 @@ public class SelectionCommands {
+ min2D.getBlockX() + ", " + min2D.getBlockZ() + ") - ("
+ max2D.getBlockX() + ", " + max2D.getBlockZ() + ")");
} else {
final Vector2D min2D = ChunkStore.toChunk(player.getBlockIn());
final Vector2D min2D;
if (args.argsLength() == 1) {
// coords specified
String[] coords = args.getString(0).split(",");
if (coords.length != 2) {
throw new InsufficientArgumentsException("Invalid coordinates specified.");
}
int x = Integer.parseInt(coords[0]);
int z = Integer.parseInt(coords[1]);
Vector2D pos = new Vector2D(x, z);
min2D = (args.hasFlag('c')) ? pos : ChunkStore.toChunk(pos.toVector());
} else {
// use player loc
min2D = ChunkStore.toChunk(player.getBlockIn());
}
min = new Vector(min2D.getBlockX() * 16, 0, min2D.getBlockZ() * 16);
max = min.add(15, world.getMaxY(), 15);
@ -234,10 +252,11 @@ public class SelectionCommands {
}
final CuboidRegionSelector selector;
if (session.getRegionSelector(world) instanceof ExtendingCuboidRegionSelector)
if (session.getRegionSelector(world) instanceof ExtendingCuboidRegionSelector) {
selector = new ExtendingCuboidRegionSelector(world);
else
} else {
selector = new CuboidRegionSelector(world);
}
selector.selectPrimary(min);
selector.selectSecondary(max);
session.setRegionSelector(world, selector);