diff --git a/pom.xml b/pom.xml index 3bd861baf..02813205c 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ UTF-8 PlotSquared - 3.2.10 + 3.2.12 PlotSquared jar diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Copy.java b/src/main/java/com/intellectualcrafters/plot/commands/Copy.java index ad11438ca..efdb27a66 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Copy.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Copy.java @@ -54,13 +54,17 @@ public class Copy extends SubCommand { MainUtil.sendMessage(plr, C.NO_PLOT_PERMS); return false; } + if (args.length != 1) { + C.COMMAND_SYNTAX.send(plr, getUsage()); + return false; + } final Plot plot2 = MainUtil.getPlotFromString(plr, args[0], true); if ((plot2 == null)) { return false; } if (plot1.equals(plot2)) { MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_ID); - MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot copy "); + C.COMMAND_SYNTAX.send(plr, getUsage()); return false; } if (!plot1.getWorld().equals(plot2.getWorld())) { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Move.java b/src/main/java/com/intellectualcrafters/plot/commands/Move.java index 97d9b3e37..296d85f1e 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Move.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Move.java @@ -20,19 +20,23 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// package com.intellectualcrafters.plot.commands; -import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.PlotWorld; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; import com.plotsquared.general.commands.Argument; import com.plotsquared.general.commands.CommandDeclaration; -@CommandDeclaration(command = "move", description = "Move a plot", aliases = { "debugmove" }, permission = "plots.move", category = CommandCategory.ACTIONS, requiredType = RequiredType.NONE) +@CommandDeclaration( +usage = "/plot move ", +command = "move", +description = "Move a plot", +aliases = { "debugmove" }, +permission = "plots.move", +category = CommandCategory.ACTIONS, +requiredType = RequiredType.NONE) public class Move extends SubCommand { public Move() { @@ -50,6 +54,10 @@ public class Move extends SubCommand { MainUtil.sendMessage(plr, C.NO_PLOT_PERMS); return false; } + if (args.length != 1) { + C.COMMAND_SYNTAX.send(plr, getUsage()); + return false; + } final Plot plot2 = MainUtil.getPlotFromString(plr, args[0], true); if ((plot2 == null)) { return false; diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Swap.java b/src/main/java/com/intellectualcrafters/plot/commands/Swap.java index cef1bcbfe..ec66d3b8d 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Swap.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Swap.java @@ -20,22 +20,15 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// package com.intellectualcrafters.plot.commands; -import java.util.ArrayList; - import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotCluster; -import com.intellectualcrafters.plot.object.PlotClusterId; -import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.ChunkManager; -import com.intellectualcrafters.plot.util.ClusterManager; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; import com.plotsquared.general.commands.CommandDeclaration; -@CommandDeclaration(command = "swap", description = "Swap two plots", aliases = { "switch" }, category = CommandCategory.ACTIONS, requiredType = RequiredType.NONE) +@CommandDeclaration(usage = "/plot swap ", command = "swap", description = "Swap two plots", aliases = { "switch" }, category = CommandCategory.ACTIONS, requiredType = RequiredType.NONE) public class Swap extends SubCommand { @Override @@ -49,6 +42,10 @@ public class Swap extends SubCommand { MainUtil.sendMessage(plr, C.NO_PLOT_PERMS); return false; } + if (args.length != 1) { + C.COMMAND_SYNTAX.send(plr, getUsage()); + return false; + } final Plot plot2 = MainUtil.getPlotFromString(plr, args[0], true); if ((plot2 == null)) { return false; diff --git a/target/PlotSquared-Bukkit.jar b/target/PlotSquared-Bukkit.jar index 63489c6e3..9d1116e16 100644 Binary files a/target/PlotSquared-Bukkit.jar and b/target/PlotSquared-Bukkit.jar differ