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

Made /butcher, /searchitem and /worldedit work on the console and added /we help as an alias for //help.

Browse Source
This commit is contained in:
TomyLobo 2011-12-15 13:28:25 +01:00
parent 370ddeb9ff
commit a4d82be697
3 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sk89q/worldedit/commands/GeneralCommands.java
View File

@ -22,6 +22,7 @@ package com.sk89q.worldedit.commands;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.minecraft.util.commands.Console;
import com.sk89q.minecraft.util.commands.NestedCommand;
import com.sk89q.worldedit.*;
import com.sk89q.worldedit.blocks.ItemType;
@ -145,6 +146,7 @@ public class GeneralCommands {
min = 1,
max = 1
)
@Console
public static void searchItem(CommandContext args, WorldEdit we,
LocalSession session, LocalPlayer player, EditSession editSession)
throws WorldEditException {
@ -219,6 +221,7 @@ public class GeneralCommands {
desc = "WorldEdit commands"
)
@NestedCommand(WorldEditCommands.class)
@Console
public static void we(CommandContext args, WorldEdit we,
LocalSession session, LocalPlayer player, EditSession editSession)
throws WorldEditException {

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

@ -28,6 +28,7 @@ import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.minecraft.util.commands.CommandsManager;
import com.sk89q.minecraft.util.commands.Console;
import com.sk89q.minecraft.util.commands.Logging;
import static com.sk89q.minecraft.util.commands.Logging.LogMode.*;
import com.sk89q.worldedit.*;
@ -365,20 +366,28 @@ public class UtilityCommands {
)
@CommandPermissions("worldedit.butcher")
@Logging(PLACEMENT)
@Console
public static void butcher(CommandContext args, WorldEdit we,
LocalSession session, LocalPlayer player, EditSession editSession)
throws WorldEditException {
int radius = args.argsLength() > 0 ? Math.max(1, args.getInteger(0)) : -1;
Vector origin = session.getPlacementPosition(player);
int flags = 0;
if (args.hasFlag('p')) flags |= KillFlags.PETS;
if (args.hasFlag('n')) flags |= KillFlags.NPCS;
if (args.hasFlag('a')) flags |= KillFlags.ANIMALS;
int killed = player.getWorld().killMobs(origin, radius, flags);
int killed;
if (player.isPlayer()) {
killed = player.getWorld().killMobs(session.getPlacementPosition(player), radius, flags);
} else {
killed = 0;
for (LocalWorld world : we.getServer().getWorlds()) {
killed += world.killMobs(new Vector(), radius, flags);
}
}
player.print("Killed " + killed + " mobs.");
}
@ -439,6 +448,7 @@ public class UtilityCommands {
min = 0,
max = -1
)
@Console
public static void help(CommandContext args, WorldEdit we,
LocalSession session, LocalPlayer player, EditSession editSession)
throws WorldEditException {

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

@ -26,6 +26,7 @@ import java.util.TimeZone;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.minecraft.util.commands.Console;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.LocalPlayer;
import com.sk89q.worldedit.LocalSession;
@ -42,6 +43,7 @@ public class WorldEditCommands {
min = 0,
max = 0
)
@Console
public static void version(CommandContext args, WorldEdit we,
LocalSession session, LocalPlayer player, EditSession editSession)
throws WorldEditException {
@ -58,6 +60,7 @@ public class WorldEditCommands {
max = 0
)
@CommandPermissions("worldedit.reload")
@Console
public static void reload(CommandContext args, WorldEdit we,
LocalSession session, LocalPlayer player, EditSession editSession)
throws WorldEditException {
@ -87,6 +90,7 @@ public class WorldEditCommands {
min = 1,
max = 1
)
@Console
public static void tz(CommandContext args, WorldEdit we,
LocalSession session, LocalPlayer player, EditSession editSession)
throws WorldEditException {
@ -96,4 +100,19 @@ public class WorldEditCommands {
player.print("The current time in that timezone is: "
+ dateFormat.format(Calendar.getInstance(tz).getTime()));
}
@Command(
aliases = { "help" },
usage = "[<command>]",
desc = "Displays help for the given command or lists all commands.",
min = 0,
max = -1
)
@Console
public static void help(CommandContext args, WorldEdit we,
LocalSession session, LocalPlayer player, EditSession editSession)
throws WorldEditException {
UtilityCommands.help(args, we, session, player, editSession);
}
}