From 3bd7f6a3a94efffa4d6e63dc8f6d8f91a2f40aca Mon Sep 17 00:00:00 2001 From: boy0001 Date: Fri, 30 Jan 2015 10:57:29 +1100 Subject: [PATCH] Fixed setowner --- PlotSquared/pom.xml | 2 +- .../plot/commands/SetOwner.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/PlotSquared/pom.xml b/PlotSquared/pom.xml index 8faac2127..c36b28070 100644 --- a/PlotSquared/pom.xml +++ b/PlotSquared/pom.xml @@ -8,7 +8,7 @@ UTF-8 PlotSquared - 2.6.0 + 2.6.1 PlotSquared jar diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java index 1ea2b55d8..c27df004e 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java @@ -39,7 +39,7 @@ import com.intellectualcrafters.plot.util.UUIDHandler; public class SetOwner extends SubCommand { public SetOwner() { - super("setowner", "plots.admin.command.setowner", "Set the plot owner", "setowner {player}", "so", CommandCategory.ACTIONS, true); + super("setowner", "plots.set.owner", "Set the plot owner", "setowner {player}", "so", CommandCategory.ACTIONS, true); } /* @@ -57,19 +57,21 @@ public class SetOwner extends SubCommand { Plot plot = PlayerFunctions.getCurrentPlot(plr); if (plot == null || plot.owner == null) { PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT); - return true; + return false; } if (args.length < 1) { PlayerFunctions.sendMessage(plr, C.NEED_USER); - return true; + return false; + } + + if (!plot.owner.equals(UUIDHandler.getUUID(plr))) { + PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.admin.command.setowner"); + return false; } - final World world = plr.getWorld(); final PlotId bot = PlayerFunctions.getBottomPlot(world, plot).id; final PlotId top = PlayerFunctions.getTopPlot(world, plot).id; - final ArrayList plots = PlayerFunctions.getPlotSelectionIds(bot, top); - for (final PlotId id : plots) { final Plot current = PlotMain.getPlots(world).get(id); @@ -89,9 +91,7 @@ public class SetOwner extends SubCommand { } } PlotHelper.setSign(world, args[0], plot); - PlayerFunctions.sendMessage(plr, C.SET_OWNER); - return true; } }