Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow remove command to be used from console

Browse Source
This commit is contained in:
wizjany 2013-03-26 00:50:45 -04:00
parent 0e8508847e
commit 51515473bc
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sk89q/worldedit/WorldEdit.java
View File

@ -1398,6 +1398,8 @@ public class WorldEdit {
} catch (CommandUsageException e) { } catch (CommandUsageException e) {
player.printError(e.getMessage()); player.printError(e.getMessage());
player.printError(e.getUsage()); player.printError(e.getUsage());
} catch (PlayerNeededException e) {
player.printError(e.getMessage());
} catch (WrappedCommandException e) { } catch (WrappedCommandException e) {
throw e.getCause(); throw e.getCause();
} catch (UnhandledCommandException e) { } catch (UnhandledCommandException e) {

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

@ -450,6 +450,7 @@ public class UtilityCommands {
) )
@CommandPermissions("worldedit.remove") @CommandPermissions("worldedit.remove")
@Logging(PLACEMENT) @Logging(PLACEMENT)
@Console
public void remove(CommandContext args, LocalSession session, LocalPlayer player, public void remove(CommandContext args, LocalSession session, LocalPlayer player,
EditSession editSession) throws WorldEditException { EditSession editSession) throws WorldEditException {
@ -491,8 +492,15 @@ public class UtilityCommands {
return; return;
} }
Vector origin = session.getPlacementPosition(player); int removed = 0;
int removed = player.getWorld().removeEntities(type, origin, radius); 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."); player.print("Marked " + removed + " entit(ies) for removal.");
} }