Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-12-27 17:28:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Permission cleanup

Browse Source 
- Removed plotme perms
- Fixed incorrect permission for "/plot flag remove"
- Fixed incorrect administrative unlink node
- Removed compat alias from "/plot set alias" command

I've documented all removed permission packages and fixed permissions in detail on the v6 page. So it's easy to go-by when updating.
This commit is contained in:
N0tMyFaultOG 2020-08-13 23:32:13 +02:00
parent 0eeface374
commit 7f104c249a
4 changed files with 243 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

400
Bukkit/src/main/resources/plugin.yml
View File

@ -19,8 +19,245 @@ commands:
permissions:
plots.use:
default: true
plots.projectile.unowned:
default: false
plots.projectile.other:
default: false
plots.toggle.titles:
default: false
plots.toggle.chat:
default: false
plots.toggle.time:
default: false
plots.merge.other:
default: false
plots.merge.keeproad.denied:
default: false
plots.trust.everyone:
default: false
plots.area.create:
default: false
plots.area.info:
default: false
plots.area.list:
default: false
plots.area.regen:
default: false
plots.area.tp:
default: false
plots.auto.mega:
default: false
plots.continue:
default: false
plots.cluster.list:
default: false
plots.cluster.create:
default: false
plots.cluster.create.other:
default: false
plots.cluster.size:
default: false
plots.cluster.delete.other:
default: false
plots.cluster.resize:
default: false
plots.cluster.resize.other:
default: false
plots.cluster.resize.shrink:
default: false
plots.cluster.resize.expand:
default: false
plots.cluster:
default: false
plots.cluster.invite:
default: false
plots.cluster.invite.other:
default: false
plots.cluster.kick:
default: false
plots.cluster.kick.other:
default: false
plots.cluster.leave:
default: false
plots.cluster.tp:
default: false
plots.cluster.tp.other:
default: false
plots.cluster.sethome:
default: false
plots.cluster.sethome.other:
default: false
plots.cluster.command.continue:
default: false
plots.deny.everyone:
default: false
plots.download.world:
default: false
plots.set.flag.other:
default: false
plots.set.flag:
default: false
plots.flag.remove:
default: false
plots.flag.list:
default: false
plots.list.forsale:
default: false
plots.list.mine:
default: false
plots.list.shared:
default: false
plots.list.world:
default: false
plots.list.top:
default: false
plots.list.all:
default: false
plots.list.unowned:
default: false
plots.list.player:
default: false
plots.list.done:
default: false
plots.list.expired:
default: false
plots.list.fuzzy:
default: false
plots.list.area:
default: false
plots.comment:
default: false
plots.schematic.paste:
default: false
plots.schematic.list:
default: false
plots.schematic.save:
default: false
plots.visit.shared:
default: false
plots.visit.unowned:
default: false
plots.visit.owned:
default: false
plots.visit.other:
default: false
plots.home:
default: false
plots.alias.remove:
default: false
plots.backup:
default: false
plots.backup.save:
default: false
plots.backup.list:
default: false
plots.backup.load:
default: false
plots.admin:
default: false
plots.admin.command.continue:
default: false
plots.admin.command.delete:
default: false
plots.admin.command.deny:
default: false
plots.admin.command.done:
default: false
plots.admin.command.download:
default: false
plots.admin.command.kick:
default: false
plots.admin.command.load:
default: false
plots.admin.command.merge:
default: false
plots.admin.command.setowner:
default: false
plots.admin.command.remove:
default: false
plots.admin.command.save:
default: false
plots.admin.command.schematic.paste:
default: false
plots.admin.command.schematic.save:
default: false
plots.admin.command.unlink:
default: false
plots.admin.alias.set:
default: false
plots.admin.alias.remove:
default: false
plots.admin.chat.bypass:
default: false
plots.admin.backup.other:
default: false
plots.admin.unsafe:
default: false
plots.admin.debug.other:
default: false
plots.admin.area.sudo:
default: false
plots.admin.interact.blockedcommands:
default: false
plots.admin.update.notify:
default: false
plots.admin.exit.denied:
default: false
plots.admin.entry.denied:
default: false
plots.admin.visit.untrusted:
default: false
plots.admin.entry.forcefield:
default: false
plots.admin.command.chat:
default: false
plots.admin.caps.other:
default: false
plots.admin.destroy.unowned:
default: false
plots.admin.destroy.groundlevel:
default: false
plots.admin.destroy.other:
default: false
plots.admin.destroy.road:
default: false
plots.admin.build.road:
default: false
plots.admin.build.unowned:
default: false
plots.admin.build.other:
default: false
plots.admin.interact.road:
default: false
plots.admin.interact.unowned:
default: false
plots.admin.interact.other:
default: false
plots.admin.build.heightlimit:
default: false
plots.admin.command.update:
default: false
plots.admin.command.rate:
default: false
plots.admin.command.trust:
default: false
plots.admin.info.force:
default: false
plots.admin.command.schematic:
default: false
plots.admin.command.clear:
default: false
plots.teleport.delay.bypass:
default: false
plots.worldedit.bypass:
default: false
plots.gamemode.bypass:
default: op
plots.confirm.bypass:
default: false
plots.permpack.basicflags:
default: op
children:
@ -73,7 +310,6 @@ permissions:
plots.permpack.basicinbox:
default: op
children:
comments.notifications.enabled: true
plots.inbox.read.public: true
plots.inbox.modify.public: true
plots.inbox.write.public: true
@ -111,7 +347,6 @@ permissions:
plots.list.all: true
plots.list.forsale: true
plots.list.unowned: true
plots.list.unknown: true
plots.set: true
plots.visit: true
plots.visit.owned: true
@ -131,7 +366,6 @@ permissions:
plots.toggle.time: true
plots.set.biome: true
plots.set.home: true
plots.set.alias: true
plots.alias.set: true
plots.alias.remove: true
plots.set.description: true
@ -153,162 +387,4 @@ permissions:
plots.save: true
plots.done: true
plots.continue: true
plots.middle: true
plots.worldedit.bypass:
default: false
plots.gamemode.bypass:
default: op
plots.confirm.bypass:
default: false
plotme.use:
description: Gives default user commands
children:
plots.permpack.basic: true
plots.plot.1: true
plotme.admin:
description: Gives default administrator commands
children:
plots.admin: true
plotme.use.middle:
children:
plots.middle: true
plotme.use.buy:
children:
plots.buy: true
plotme.use.sell:
children:
plots.set: true
plots.flag: true
plots.set.flag: true
plots.set.price.*: true
plotme.use.dispose:
children:
plots.delete: true
plotme.use.done:
children:
plots.done: true
plotme.use.claim:
children:
plots.claim: true
plotme.use.auto:
children:
plots.auto: true
plotme.use.reset:
children:
plots.delete: true
plotme.use.home:
children:
plots.home: true
plotme.use.info:
children:
plots.info: true
plotme.use.biome:
children:
plots.set: true
plots.set.biome: true
plotme.use.clear:
children:
plots.clear: true
plotme.use.list:
children:
plots.list: true
plots.list.forsale: true
plots.list.mine: true
plots.list.shared: true
plotme.use.add:
children:
plots.add: true
plots.trust: true
plots.add.everyone: true
plots.trust.everyone: true
plotme.use.deny:
children:
plots.deny: true
plots.deny.everyone: true
plotme.use.remove:
children:
plots.remove: true
plotme.use.undeny:
children:
plots.remove: true
plotme.use.protect:
children:
plots.set: true
plots.flag: true
plots.set.flag: true
plots.set.keep.*: true
plotme.use.nameplot:
children:
plots.set.alias: true
plots.alias.set: true
plots.alias.remove: true
plotme.limit.*:
children:
plots.plot.*: true
plotme.limit.1:
children:
plots.plot.1: true
plotme.limit.5:
children:
plots.plot.5: true
plotme.limit.10:
children:
plots.plot.10: true
plotme.admin.clear:
children:
plots.admin.command.clear: true
plotme.admin.reset:
children:
plots.admin.command.delete: true
plotme.admin.add:
children:
plots.admin.command.add: true
plotme.admin.deny:
children:
plots.admin.command.deny: true
plotme.admin.remove:
children:
plots.admin.command.remove: true
plotme.admin.undeny:
children:
plots.admin.command.remove: true
plotme.admin.bypassdeny:
children:
plots.admin.entry.denied: true
plotme.admin.setowner:
children:
plots.admin.command.setowner: true
plotme.admin.move:
children:
plots.admin.command.move: true
plotme.admin.weanywhere:
children:
plots.worldedit.bypass: true
plotme.admin.list:
children:
plots.list.world: true
plots.list.world.*: true
plots.list.top: true
plots.list.all: true
plots.list.unowned: true
plots.list.unknown: true
plots.list.player: true
plots.list.done: true
plots.list.expired: true
plots.list.fuzzy: true
plots.list.area: true
plotme.admin.dispose:
children:
plots.admin.command.delete: true
plotme.admin.done:
children:
plots.admin.command.done: true
plotme.admin.expired:
children:
plots.list.expired: true
plotme.admin.buildanywhere:
children:
plots.admin.vehicle.*: true
plots.admin.interact.*: true
plots.admin.build.*: true
plots.admin.destroy.*: true
plots.middle: true

3
Core/src/main/java/com/plotsquared/core/command/Alias.java
View File

@ -84,8 +84,7 @@ public class Alias extends SubCommand {
return false;
}
permission = isPermitted(player, Permission.PERMISSION_ALIAS_SET)
|| isPermitted(player, Permission.PERMISSION_ALIAS_SET_OBSOLETE);
permission = isPermitted(player, Permission.PERMISSION_ALIAS_SET);
admin = isPermitted(player, Permission.PERMISSION_ADMIN_ALIAS_SET);
if (!admin && !owner) {
player.sendMessage(TranslatableCaption.of("permission.no_plot_perms"));

2
Core/src/main/java/com/plotsquared/core/command/FlagCommand.java
View File

@ -402,7 +402,7 @@ public final class FlagCommand extends Command {
description = "Remove a flag",
category = CommandCategory.SETTINGS,
requiredType = RequiredType.NONE,
permission = "plots.flag.add")
permission = "plots.flag.remove")
public void remove(final Command command, PlotPlayer<?> player, final String[] args,
final RunnableVal3<Command, Runnable, Runnable> confirm,
final RunnableVal2<Command, CommandResult> whenDone) {

9
Core/src/main/java/com/plotsquared/core/permissions/Permission.java
View File

@ -28,7 +28,7 @@ package com.plotsquared.core.permissions;
import javax.annotation.Nonnull;
/**
* Captions class.
* Permission class.
*/
public enum Permission {
@ -79,6 +79,7 @@ public enum Permission {
PERMISSION_ADMIN_COMMAND_SCHEMATIC("plots.admin.command.schematic"),
PERMISSION_ADMIN_COMMAND_CLEAR("plots.admin.command.clear"),
PERMISSION_CONTINUE("plots.continue"),
PERMISSION_CLUSTER("plots.cluster"),
PERMISSION_CLUSTER_LIST("plots.cluster.list"),
PERMISSION_CLUSTER_CREATE("plots.cluster.create"),
PERMISSION_CLUSTER_CREATE_OTHER("plots.cluster.create.other"),
@ -89,7 +90,6 @@ public enum Permission {
PERMISSION_CLUSTER_RESIZE_OTHER("plots.cluster.resize.other"),
PERMISSION_CLUSTER_RESIZE_SHRINK("plots.cluster.resize.shrink"),
PERMISSION_CLUSTER_RESIZE_EXPAND("plots.cluster.resize.expand"),
PERMISSION_CLUSTER("plots.cluster"),
PERMISSION_CLUSTER_INVITE("plots.cluster.invite"),
PERMISSION_CLUSTER_INVITE_OTHER("plots.cluster.invite.other"),
PERMISSION_CLUSTER_KICK("plots.cluster.kick"),
@ -125,7 +125,6 @@ public enum Permission {
PERMISSION_LIST_TOP("plots.list.top"),
PERMISSION_LIST_ALL("plots.list.all"),
PERMISSION_LIST_UNOWNED("plots.list.unowned"),
PERMISSION_LIST_UNKNOWN("plots.list.unknown"),
PERMISSION_LIST_PLAYER("plots.list.player"),
PERMISSION_LIST_DONE("plots.list.done"),
PERMISSION_LIST_EXPIRED("plots.list.expired"),
@ -144,13 +143,12 @@ public enum Permission {
PERMISSION_ADMIN_COMMAND_SCHEMATIC_SAVE("plots.admin.command.schematic.save"),
PERMISSION_SET_COMPONENT("plots.set.%s"),
PERMISSION_ADMIN_COMMAND("plots.admin.command.%s"),
PERMISSION_ADMIN_COMMAND_UNLINK("plots.ad2min.command.unlink"),
PERMISSION_ADMIN_COMMAND_UNLINK("plots.admin.command.unlink"),
PERMISSION_VISIT_UNOWNED("plots.visit.unowned"),
PERMISSION_VISIT_OWNED("plots.visit.owned"),
PERMISSION_SHARED("plots.visit.shared"),
PERMISSION_VISIT_OTHER("plots.visit.other"),
PERMISSION_HOME("plots.home"),
PERMISSION_ALIAS_SET_OBSOLETE("plots.set.alias"), // Note this is for backwards compatibility
PERMISSION_ALIAS_SET("plots.alias.set"),
PERMISSION_ADMIN_ALIAS_SET("plots.admin.alias.set"),
PERMISSION_ALIAS_REMOVE("plots.alias.remove"),
@ -165,7 +163,6 @@ public enum Permission {
PERMISSION_ADMIN_DEBUG_OTHER("plots.admin.debug.other");
//</editor-fold>
private final String text;
Permission(@Nonnull final String text) {