EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 15:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Permission for merging with friends

Browse Source
This commit is contained in:
boy0001 2015-07-14 03:42:02 +10:00
parent ab1a89e601
commit f2b0fa43dc
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
View File

@ -159,6 +159,10 @@ public class Merge extends SubCommand {
multiUUID.add(u2); multiUUID.add(u2);
} }
if (multiMerge) { if (multiMerge) {
if (!Permissions.hasPermission(plr, Permissions.MERGE_OTHER)) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, Permissions.MERGE_OTHER);
return false;
}
for (final UUID uuid : multiUUID) { for (final UUID uuid : multiUUID) {
PlotPlayer accepter = UUIDHandler.getPlayer(uuid); PlotPlayer accepter = UUIDHandler.getPlayer(uuid);
CmdConfirm.addPending(accepter, C.MERGE_REQUEST_CONFIRM.s().replaceAll("%s", plr.getName()), new Runnable() { CmdConfirm.addPending(accepter, C.MERGE_REQUEST_CONFIRM.s().replaceAll("%s", plr.getName()), new Runnable() {

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/Permissions.java
View File

@ -17,7 +17,9 @@ public enum Permissions {
// BREAK // BREAK
BREAK_OTHER("plots.admin.break.other", "break"), BREAK_OTHER("plots.admin.break.other", "break"),
BREAK_ROAD("plots.admin.break.road", "break"), BREAK_ROAD("plots.admin.break.road", "break"),
BREAK_UNOWNED("plots.admin.break.unowned", "break"); BREAK_UNOWNED("plots.admin.break.unowned", "break"),
// MERGE
MERGE_OTHER("plots.merge.other", "merge");
public String s; public String s;
public String cat; public String cat;
@ -27,6 +29,10 @@ public enum Permissions {
this.cat = cat; this.cat = cat;
} }
public static boolean hasPermission(final PlotPlayer player, final Permissions perm) {
return hasPermission(player, perm.s);
}
public static boolean hasPermission(final PlotPlayer player, final String perm) { public static boolean hasPermission(final PlotPlayer player, final String perm) {
if ((player == null) || player.isOp() || player.hasPermission(ADMIN.s)) { if ((player == null) || player.isOp() || player.hasPermission(ADMIN.s)) {
return true; return true;

1
PlotSquared/src/main/resources/plugin.yml
View File

@ -112,6 +112,7 @@ permissions:
plots.set.biome: true plots.set.biome: true
plots.set.home: true plots.set.home: true
plots.merge: true plots.merge: true
plots.merge.other: true
plots.unlink: true plots.unlink: true
plots.denied: true plots.denied: true
plots.add: true plots.add: true