From 0f3e893aafc7b844481b11eec96b5dab3f6797af Mon Sep 17 00:00:00 2001 From: wizjany Date: Fri, 19 Jun 2015 18:08:20 -0400 Subject: [PATCH] Force region claiming to use UUIDs. Also remove owner params from the command, they were ignored anyway. Claim only adds the player using the command. Fixes WORLDGUARD-3504. --- .../bukkit/commands/region/RegionCommands.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionCommands.java index e92e7f53..4527623a 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionCommands.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionCommands.java @@ -60,6 +60,7 @@ import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion; import com.sk89q.worldguard.protection.regions.ProtectedRegion; import com.sk89q.worldguard.protection.regions.ProtectedRegion.CircularInheritanceException; +import com.sk89q.worldguard.protection.util.DomainInputResolver.UserLocatorPolicy; import com.sk89q.worldguard.util.Enums; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -201,9 +202,9 @@ public void redefine(CommandContext args, CommandSender sender) throws CommandEx * @throws CommandException any error */ @Command(aliases = {"claim"}, - usage = " [ [ []]]", + usage = "", desc = "Claim a region", - min = 1) + min = 1, max = 1) public void claim(CommandContext args, CommandSender sender) throws CommandException { warnAboutSaveFailures(sender); @@ -279,9 +280,9 @@ public void claim(CommandContext args, CommandSender sender) throws CommandExcep } } - region.getOwners().addPlayer(player.getName()); - RegionAdder task = new RegionAdder(plugin, manager, region); + task.setLocatorPolicy(UserLocatorPolicy.UUID_ONLY); + task.setOwnersInput(new String[]{player.getName()}); ListenableFuture future = plugin.getExecutorService().submit(task); AsyncCommandHelper.wrap(future, plugin, player)