diff --git a/AdvancedTeleport-Bukkit/build.gradle.kts b/AdvancedTeleport-Bukkit/build.gradle.kts index a323995a..1a917aec 100644 --- a/AdvancedTeleport-Bukkit/build.gradle.kts +++ b/AdvancedTeleport-Bukkit/build.gradle.kts @@ -443,19 +443,33 @@ bukkit { ) } + register("at.admin.core.*"){ + default = BukkitPluginDescription.Permission.Default.OP + childrenMap = mapOf( + "at.admin.core.clearcache" to true, + "at.admin.core.export" to true, + "at.admin.core.import" to true, + "at.admin.core.map" to true, + "at.admin.core.particles" to true, + "at.admin.core.purge" to true, + "at.admin.core.reload" to true, + "at.admin.core.map.*" to true + ) + } + register("at.member.core.*") { default = BukkitPluginDescription.Permission.Default.OP childrenMap = mapOf( - "at.member.core.clearcache" to true, - "at.member.core.export" to true, + "at.member.core.clearcache" to false, + "at.member.core.export" to false, "at.member.core.help" to true, - "at.member.core.import" to true, + "at.member.core.import" to false, "at.member.core.info" to true, - "at.member.core.map" to true, - "at.member.core.particles" to true, - "at.member.core.purge" to true, - "at.member.core.reload" to true, - "at.member.core.map.*" to true + "at.member.core.map" to false, + "at.member.core.particles" to false, + "at.member.core.purge" to false, + "at.member.core.reload" to false, + "at.member.core.map.*" to false ) } @@ -506,7 +520,7 @@ bukkit { "at.member.warps.location" to true, "at.member.homes.location" to true, "at.member.spawn.*" to false, - "at.member.core.*" to false + "at.member.core.*" to true ) } diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/CoreCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/CoreCommand.java index 054c7d4c..c75ea3e5 100644 --- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/CoreCommand.java +++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/CoreCommand.java @@ -37,7 +37,7 @@ public boolean onCommand( help.onCommand(sender, cmd, s, args); return true; } - if (sender.hasPermission("at.member.core." + command)) { + if (sender.hasPermission("at.member.core." + command) || sender.hasPermission("at.admin.core." + command)) { CommandManager.subcommands.get(command).onCommand(sender, cmd, s, Arrays.copyOfRange(args, 1, args.length)); } else { CustomMessages.sendMessage(sender, "Error.noPermission"); @@ -73,7 +73,7 @@ public boolean getRequiredFeature() { List availableCommands = new ArrayList<>(); List chosenCommands = new ArrayList<>(); for (String command : CommandManager.subcommands.keySet()) { - if (sender.hasPermission("at.member.core." + command)) { + if (sender.hasPermission("at.member.core." + command) || sender.hasPermission("at.admin.core." + command)) { availableCommands.add(command); } } diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/MainConfig.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/MainConfig.java index f4cb6f7c..d834108c 100644 --- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/MainConfig.java +++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/MainConfig.java @@ -870,7 +870,7 @@ public void postSave() { permObject.setDefault(PermissionDefault.TRUE); defaults.add(permission); } - }, 200); + }, 20); } public static class ConfigOption {