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

Added a thickness parameter to //hollow.

Browse Source
This commit is contained in:
TomyLobo 2011-12-19 11:58:38 +01:00
parent 936aff06b2
commit 633f6643a5
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2731,7 +2731,7 @@ public class EditSession {
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException * @throws MaxChangedBlocksException
*/ */
public int hollowOutRegion(Region region) throws MaxChangedBlocksException { public int hollowOutRegion(Region region, int thickness) throws MaxChangedBlocksException {
int affected = 0; int affected = 0;
Set<BlockVector> outside = new HashSet<BlockVector>(); Set<BlockVector> outside = new HashSet<BlockVector>();
@ -2769,6 +2769,23 @@ public class EditSession {
BaseBlock air = new BaseBlock(BlockID.AIR); BaseBlock air = new BaseBlock(BlockID.AIR);
for (int i = 1; i < thickness; ++i) {
final Set<BlockVector> newOutside = new HashSet<BlockVector>(outside);
outer: for (BlockVector position : region) {
for (Vector recurseDirection: recurseDirections) {
BlockVector neighbor = position.add(recurseDirection).toBlockVector();
if (outside.contains(neighbor)) {
newOutside.add(position);
continue outer;
}
}
}
outside = newOutside;
}
outer: for (BlockVector position : region) { outer: for (BlockVector position : region) {
for (Vector recurseDirection: recurseDirections) { for (Vector recurseDirection: recurseDirections) {
BlockVector neighbor = position.add(recurseDirection).toBlockVector(); BlockVector neighbor = position.add(recurseDirection).toBlockVector();

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

@ -394,17 +394,19 @@ public class RegionCommands {
@Command( @Command(
aliases = { "/hollow" }, aliases = { "/hollow" },
usage = "", usage = "[<thickness>]",
desc = "Hollows out the object contained in this selection", desc = "Hollows out the object contained in this selection",
min = 0, min = 0,
max = 0 max = 1
) )
@CommandPermissions("worldedit.region.hollow") @CommandPermissions("worldedit.region.hollow")
@Logging(REGION) @Logging(REGION)
public void hollow(CommandContext args, LocalSession session, LocalPlayer player, public void hollow(CommandContext args, LocalSession session, LocalPlayer player,
EditSession editSession) throws WorldEditException { EditSession editSession) throws WorldEditException {
int affected = editSession.hollowOutRegion(session.getSelection(player.getWorld())); int thickness = args.argsLength() > 0 ? Math.max(1, args.getInteger(0)) : 1;
int affected = editSession.hollowOutRegion(session.getSelection(player.getWorld()), thickness);
player.print(affected + " block(s) have been changed."); player.print(affected + " block(s) have been changed.");
} }