mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-04 14:44:43 +02:00
Compare commits
1 Commits
docs/ploti
...
feature/v7
Author | SHA1 | Date | |
---|---|---|---|
3796072c3a |
@ -109,7 +109,7 @@ public class Merge extends SubCommand {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (direction == null && (args[0].equalsIgnoreCase("all") || args[0]
|
if (direction == null && (args[0].equalsIgnoreCase("all") || args[0]
|
||||||
.equalsIgnoreCase("auto"))) {
|
.equalsIgnoreCase("auto")) && player.hasPermission(Permission.PERMISSION_MERGE_ALL)) {
|
||||||
direction = Direction.ALL;
|
direction = Direction.ALL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -45,6 +45,7 @@ public enum Permission implements ComponentLike {
|
|||||||
PERMISSION_ADMIN_ENTRY_FORCEFIELD("plots.admin.entry.forcefield"),
|
PERMISSION_ADMIN_ENTRY_FORCEFIELD("plots.admin.entry.forcefield"),
|
||||||
PERMISSION_ADMIN_COMMANDS_CHATSPY("plots.admin.command.chatspy"),
|
PERMISSION_ADMIN_COMMANDS_CHATSPY("plots.admin.command.chatspy"),
|
||||||
PERMISSION_MERGE("plots.merge"),
|
PERMISSION_MERGE("plots.merge"),
|
||||||
|
PERMISSION_MERGE_ALL("plots.merge.all"),
|
||||||
PERMISSION_MERGE_OTHER("plots.merge.other"),
|
PERMISSION_MERGE_OTHER("plots.merge.other"),
|
||||||
PERMISSION_MERGE_KEEP_ROAD("plots.merge.keeproad"),
|
PERMISSION_MERGE_KEEP_ROAD("plots.merge.keeproad"),
|
||||||
PERMISSION_ADMIN_CAPS_OTHER("plots.admin.caps.other"),
|
PERMISSION_ADMIN_CAPS_OTHER("plots.admin.caps.other"),
|
||||||
|
Reference in New Issue
Block a user