Fixed subcommands not inheriting permissions from parent commands (mostly admin commands)

This commit is contained in:
Florian CUNY 2020-01-24 21:18:33 +01:00
parent 3147357bad
commit 3b0f023fac
29 changed files with 30 additions and 10 deletions

View File

@ -14,6 +14,7 @@ public class AdminBlueprintCopyCommand extends CompositeCommand {
@Override
public void setup() {
inheritPermission();
setParametersHelp("commands.admin.blueprint.copy.parameters");
setDescription("commands.admin.blueprint.copy.description");
}

View File

@ -22,6 +22,7 @@ public class AdminBlueprintDeleteCommand extends ConfirmableCommand {
@Override
public void setup() {
inheritPermission();
setParametersHelp("commands.admin.blueprint.delete.parameters");
setDescription("commands.admin.blueprint.delete.description");
}

View File

@ -20,6 +20,7 @@ public class AdminBlueprintListCommand extends CompositeCommand {
@Override
public void setup() {
inheritPermission();
setDescription("commands.admin.blueprint.list.description");
}

View File

@ -17,13 +17,14 @@ public class AdminBlueprintLoadCommand extends CompositeCommand {
@Override
public void setup() {
inheritPermission();
setParametersHelp("commands.admin.blueprint.load.parameters");
setDescription("commands.admin.blueprint.load.description");
}
@Override
public boolean execute(User user, String label, List<String> args) {
if (args.isEmpty() || args.size() != 1) {
if (args.size() != 1) {
showHelp(this, user);
return false;
}

View File

@ -18,6 +18,7 @@ public class AdminBlueprintOriginCommand extends CompositeCommand {
@Override
public void setup() {
inheritPermission();
setParametersHelp("commands.admin.blueprint.origin.parameters");
setDescription("commands.admin.blueprint.origin.description");
}

View File

@ -15,6 +15,7 @@ public class AdminBlueprintPasteCommand extends CompositeCommand {
@Override
public void setup() {
inheritPermission();
setParametersHelp("commands.admin.blueprint.paste.parameters");
setDescription("commands.admin.blueprint.paste.description");
}

View File

@ -15,6 +15,7 @@ public class AdminBlueprintPos1Command extends CompositeCommand {
@Override
public void setup() {
inheritPermission();
setParametersHelp("commands.admin.blueprint.pos1.parameters");
setDescription("commands.admin.blueprint.pos1.description");
}

View File

@ -15,6 +15,7 @@ public class AdminBlueprintPos2Command extends CompositeCommand {
@Override
public void setup() {
inheritPermission();
setParametersHelp("commands.admin.blueprint.pos2.parameters");
setDescription("commands.admin.blueprint.pos2.description");
}

View File

@ -23,6 +23,7 @@ public class AdminBlueprintRenameCommand extends ConfirmableCommand {
@Override
public void setup() {
inheritPermission();
setParametersHelp("commands.admin.blueprint.rename.parameters");
setDescription("commands.admin.blueprint.rename.description");
}

View File

@ -18,6 +18,7 @@ public class AdminBlueprintSaveCommand extends ConfirmableCommand {
@Override
public void setup() {
inheritPermission();
setParametersHelp("commands.admin.blueprint.save.parameters");
setDescription("commands.admin.blueprint.save.description");
}

View File

@ -22,6 +22,7 @@ public class AdminDeathsAddCommand extends CompositeCommand {
@Override
public void setup() {
inheritPermission();
setDescription("commands.admin.deaths.add.description");
setParametersHelp("commands.admin.deaths.add.parameters");
}

View File

@ -22,6 +22,7 @@ public class AdminDeathsRemoveCommand extends CompositeCommand {
@Override
public void setup() {
inheritPermission();
setDescription("commands.admin.deaths.remove.description");
setParametersHelp("commands.admin.deaths.remove.parameters");
}

View File

@ -20,6 +20,7 @@ public class AdminDeathsResetCommand extends CompositeCommand {
@Override
public void setup() {
inheritPermission();
setDescription("commands.admin.deaths.reset.description");
setParametersHelp("commands.admin.deaths.reset.parameters");
}

View File

@ -21,6 +21,7 @@ public class AdminDeathsSetCommand extends CompositeCommand {
@Override
public void setup() {
inheritPermission();
setDescription("commands.admin.deaths.set.description");
setParametersHelp("commands.admin.deaths.set.parameters");
}

View File

@ -16,7 +16,7 @@ public class AdminPurgeProtectCommand extends CompositeCommand {
@Override
public void setup() {
setPermission("admin.purge");
inheritPermission();
setOnlyPlayer(true);
setDescription("commands.admin.purge.protect.description");
}

View File

@ -13,7 +13,7 @@ public class AdminPurgeStopCommand extends CompositeCommand {
@Override
public void setup() {
setPermission("admin.purge");
inheritPermission();
setOnlyPlayer(false);
setDescription("commands.admin.purge.stop.description");
}

View File

@ -17,7 +17,7 @@ public class AdminPurgeUnownedCommand extends ConfirmableCommand {
@Override
public void setup() {
setPermission("admin.purge");
inheritPermission();
setOnlyPlayer(false);
setParametersHelp("commands.admin.purge.unowned.parameters");
setDescription("commands.admin.purge.unowned.description");

View File

@ -24,6 +24,7 @@ public class AdminRangeAddCommand extends CompositeCommand {
@Override
public void setup() {
inheritPermission();
setDescription("commands.admin.range.add.description");
setParametersHelp("commands.admin.range.add.parameters");
}

View File

@ -24,6 +24,7 @@ public class AdminRangeRemoveCommand extends CompositeCommand {
@Override
public void setup() {
inheritPermission();
setDescription("commands.admin.range.remove.description");
setParametersHelp("commands.admin.range.remove.parameters");
}

View File

@ -22,6 +22,7 @@ public class AdminResetsAddCommand extends CompositeCommand {
@Override
public void setup() {
inheritPermission();
setDescription("commands.admin.resets.add.description");
setParametersHelp("commands.admin.resets.add.parameters");
}

View File

@ -22,6 +22,7 @@ public class AdminResetsRemoveCommand extends CompositeCommand {
@Override
public void setup() {
inheritPermission();
setDescription("commands.admin.resets.remove.description");
setParametersHelp("commands.admin.resets.remove.parameters");
}

View File

@ -21,6 +21,7 @@ public class AdminResetsResetCommand extends ConfirmableCommand {
@Override
public void setup() {
inheritPermission();
setDescription("commands.admin.resets.reset.description");
setParametersHelp("commands.admin.resets.reset.parameters");
}

View File

@ -16,6 +16,7 @@ public class AdminResetsSetCommand extends CompositeCommand {
@Override
public void setup() {
inheritPermission();
setDescription("commands.admin.resets.set.description");
setParametersHelp("commands.admin.resets.set.parameters");
}

View File

@ -27,7 +27,7 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand {
@Override
public void setup() {
setPermission("island.team");
inheritPermission();
setOnlyPlayer(true);
setDescription("commands.island.team.invite.accept.description");
}

View File

@ -28,7 +28,7 @@ public class IslandTeamInviteCommand extends CompositeCommand {
@Override
public void setup() {
setPermission("island.team");
inheritPermission();
setOnlyPlayer(true);
setDescription("commands.island.team.invite.description");
setConfigurableRankCommand();

View File

@ -19,7 +19,7 @@ public class IslandTeamInviteRejectCommand extends CompositeCommand {
@Override
public void setup() {
setPermission("island.team");
inheritPermission();
setOnlyPlayer(true);
setDescription("commands.island.team.invite.reject.description");
}

View File

@ -21,7 +21,7 @@ public class IslandTeamKickCommand extends ConfirmableCommand {
@Override
public void setup() {
setPermission("island.team");
inheritPermission();
setOnlyPlayer(true);
setParametersHelp("commands.island.team.kick.parameters");
setDescription("commands.island.team.kick.description");

View File

@ -20,7 +20,7 @@ public class IslandTeamLeaveCommand extends ConfirmableCommand {
@Override
public void setup() {
setPermission("island.team");
inheritPermission();
setOnlyPlayer(true);
setDescription("commands.island.team.leave.description");
}

View File

@ -22,7 +22,7 @@ public class IslandTeamSetownerCommand extends CompositeCommand {
@Override
public void setup() {
setPermission("island.team");
inheritPermission();
setOnlyPlayer(true);
setParametersHelp("commands.island.team.setowner.parameters");
setDescription("commands.island.team.setowner.description");