Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2025-01-31 04:21:25 +01:00
Code Issues Projects Releases Wiki Activity

Extract/half-fix addowner checks.

Browse Source 
Max-region-count-for-player is super bork.

Fixes WORLDGUARD-4129.
This commit is contained in:
wizjany 2019-08-12 20:24:40 -04:00
parent 6cf3c23b47
commit 8db0053ffc
1 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/MemberCommands.java
View File

@ -82,42 +82,20 @@ public void addMember(CommandContext args, Actor sender) throws CommandException
flags = "nw:", flags = "nw:",
desc = "Add an owner to a region", desc = "Add an owner to a region",
min = 2) min = 2)
public void addOwner(CommandContext args, Actor sender) throws CommandException, AuthorizationException { public void addOwner(CommandContext args, Actor sender) throws CommandException {
warnAboutSaveFailures(sender); warnAboutSaveFailures(sender);
World world = checkWorld(args, sender, 'w'); // Get the world World world = checkWorld(args, sender, 'w'); // Get the world
LocalPlayer player = null;
if (sender instanceof LocalPlayer) {
player = (LocalPlayer) sender;
}
String id = args.getString(0); String id = args.getString(0);
RegionManager manager = checkRegionManager(world); RegionManager manager = checkRegionManager(world);
ProtectedRegion region = checkExistingRegion(manager, id, true); ProtectedRegion region = checkExistingRegion(manager, id, true);
id = region.getId();
DefaultDomain owners = region.getOwners();
if (player != null) {
if (owners != null && owners.size() == 0) {
if (!sender.hasPermission("worldguard.region.unlimited")) {
int maxRegionCount = WorldGuard.getInstance().getPlatform().getGlobalStateManager().get(world).getMaxRegionCount(player);
if (maxRegionCount >= 0 && manager.getRegionCountOfPlayer(player)
>= maxRegionCount) {
throw new CommandException("You already own the maximum allowed amount of regions.");
}
}
sender.checkPermission("worldguard.region.addowner.unclaimed." + id.toLowerCase());
} else {
// Check permissions // Check permissions
if (!getPermissionModel(player).mayAddOwners(region)) { if (!getPermissionModel(sender).mayAddOwners(region)) {
throw new CommandPermissionsException(); throw new CommandPermissionsException();
} }
}
}
// Resolve owners asynchronously // Resolve owners asynchronously
DomainInputResolver resolver = new DomainInputResolver( DomainInputResolver resolver = new DomainInputResolver(
@ -126,13 +104,46 @@ public void addOwner(CommandContext args, Actor sender) throws CommandException,
final String description = String.format("Adding owners to the region '%s' on '%s'", region.getId(), world.getName()); final String description = String.format("Adding owners to the region '%s' on '%s'", region.getId(), world.getName());
AsyncCommandBuilder.wrap(resolver, sender) AsyncCommandBuilder.wrap(checkedAddOwners(sender, manager, region, world, resolver), sender)
.registerWithSupervisor(worldGuard.getSupervisor(), description) .registerWithSupervisor(worldGuard.getSupervisor(), description)
.onSuccess(String.format("Region '%s' updated with new owners.", region.getId()), region.getOwners()::addAll) .onSuccess(String.format("Region '%s' updated with new owners.", region.getId()), region.getOwners()::addAll)
.onFailure("Failed to add new owners", worldGuard.getExceptionConverter()) .onFailure("Failed to add new owners", worldGuard.getExceptionConverter())
.buildAndExec(worldGuard.getExecutorService()); .buildAndExec(worldGuard.getExecutorService());
} }
private static Callable<DefaultDomain> checkedAddOwners(Actor sender, RegionManager manager, ProtectedRegion region,
World world, DomainInputResolver resolver) {
return () -> {
DefaultDomain owners = resolver.call();
// TODO this was always broken and never checked other players
if (sender instanceof LocalPlayer) {
LocalPlayer player = (LocalPlayer) sender;
if (owners.contains(player) && !sender.hasPermission("worldguard.region.unlimited")) {
int maxRegionCount = WorldGuard.getInstance().getPlatform().getGlobalStateManager()
.get(world).getMaxRegionCount(player);
if (maxRegionCount >= 0 && manager.getRegionCountOfPlayer(player)
>= maxRegionCount) {
throw new CommandException("You already own the maximum allowed amount of regions.");
}
}
}
if (region.getOwners().size() == 0) {
boolean anyOwners = false;
ProtectedRegion parent;
while ((parent = region.getParent()) != null) {
if (parent.getOwners().size() > 0) {
anyOwners = true;
break;
}
}
if (!anyOwners) {
sender.checkPermission("worldguard.region.addowner.unclaimed." + region.getId().toLowerCase());
}
}
return owners;
};
}
@Command(aliases = {"removemember", "remmember", "removemem", "remmem", "rm"}, @Command(aliases = {"removemember", "remmember", "removemem", "remmem", "rm"},
usage = "<id> <owners...>", usage = "<id> <owners...>",
flags = "naw:", flags = "naw:",