From 4895a3313b4b5b2f532a88850c08505e761f516c Mon Sep 17 00:00:00 2001 From: zml2008 Date: Sat, 10 Dec 2011 12:52:32 -0800 Subject: [PATCH] Forgot to update /slay, /wg report, and /stoplag to new commands system --- .../com/sk89q/worldguard/bukkit/commands/GeneralCommands.java | 3 +-- .../com/sk89q/worldguard/bukkit/commands/ToggleCommands.java | 3 +-- .../sk89q/worldguard/bukkit/commands/WorldGuardCommands.java | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java index 675e738e..8c74e8db 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java @@ -172,8 +172,7 @@ public void heal(CommandContext args,CommandSender sender) throws CommandExcepti } @Command(aliases = {"slay"}, usage = "[player]", desc = "Slay a player", flags = "s", max = 1) - public static void slay(CommandContext args, WorldGuardPlugin plugin, - CommandSender sender) throws CommandException { + public void slay(CommandContext args, CommandSender sender) throws CommandException { Iterable targets = null; boolean included = false; diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java index 0788caa5..2d086fc5 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java @@ -100,8 +100,7 @@ public void allowFire(CommandContext args, CommandSender sender) throws CommandE @Command(aliases = {"halt-activity"}, desc = "Attempts to cease as much activity in order to stop lag", flags = "c", max = 0) @CommandPermissions({"worldguard.halt-activity"}) - public static void stopLag(CommandContext args, WorldGuardPlugin plugin, - CommandSender sender) throws CommandException { + public void stopLag(CommandContext args, CommandSender sender) throws CommandException { ConfigurationManager configManager = plugin.getGlobalStateManager(); diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java index 2982dbae..b37d5927 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java @@ -85,8 +85,7 @@ public void reload(CommandContext args, CommandSender sender) throws CommandExce @Command(aliases = {"report"}, desc = "Writes a report on WorldGuard", flags = "p", max = 0) @CommandPermissions({"worldguard.report"}) - public static void report(CommandContext args, WorldGuardPlugin plugin, - final CommandSender sender) throws CommandException { + public void report(CommandContext args, final CommandSender sender) throws CommandException { File dest = new File(plugin.getDataFolder(), "report.txt"); ReportWriter report = new ReportWriter(plugin);