Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Allow remove command to be used from console

  • Loading branch information...
commit 51515473bc77505eb521e68a59d7ab0be96cc382 1 parent 0e85088
@wizjany wizjany authored
View
2  src/main/java/com/sk89q/worldedit/WorldEdit.java
@@ -1398,6 +1398,8 @@ public boolean handleCommand(LocalPlayer player, String[] split) {
} catch (CommandUsageException e) {
player.printError(e.getMessage());
player.printError(e.getUsage());
+ } catch (PlayerNeededException e) {
+ player.printError(e.getMessage());
} catch (WrappedCommandException e) {
throw e.getCause();
} catch (UnhandledCommandException e) {
View
12 src/main/java/com/sk89q/worldedit/commands/UtilityCommands.java
@@ -450,6 +450,7 @@ public void or(int flag, boolean on, String permission) {
)
@CommandPermissions("worldedit.remove")
@Logging(PLACEMENT)
+ @Console
public void remove(CommandContext args, LocalSession session, LocalPlayer player,
EditSession editSession) throws WorldEditException {
@@ -491,8 +492,15 @@ public void remove(CommandContext args, LocalSession session, LocalPlayer player
return;
}
- Vector origin = session.getPlacementPosition(player);
- int removed = player.getWorld().removeEntities(type, origin, radius);
+ int removed = 0;
+ if (player.isPlayer()) {
+ Vector origin = session.getPlacementPosition(player);
+ removed = player.getWorld().removeEntities(type, origin, radius);
+ } else {
+ for (LocalWorld world : we.getServer().getWorlds()) {
+ removed += world.removeEntities(type, new Vector(), radius);
+ }
+ }
player.print("Marked " + removed + " entit(ies) for removal.");
}
Please sign in to comment.
Something went wrong with that request. Please try again.