diff --git a/src/main/java/net/t2code/alias/Spigot/cmdManagement/ExecuteAlias.java b/src/main/java/net/t2code/alias/Spigot/cmdManagement/ExecuteAlias.java index 0fc5a9c..bcffa54 100644 --- a/src/main/java/net/t2code/alias/Spigot/cmdManagement/ExecuteAlias.java +++ b/src/main/java/net/t2code/alias/Spigot/cmdManagement/ExecuteAlias.java @@ -52,7 +52,7 @@ public class ExecuteAlias { Player player = (Player) sender; if (aliasObject.adminEnable) { - if (player.hasPermission(aliasObject.adminPermission)) { + if (player.hasPermission(aliasObject.adminPermission.replace("", alias.toLowerCase()))) { if (aliasObject.adminCommandEnable) { aliasAdminCommand(aliasObject, alias, player, args); } @@ -127,7 +127,7 @@ public class ExecuteAlias { Player player = (Player) sender; if (aliasObject.adminEnable) { - if (player.hasPermission(aliasObject.adminPermission)) { + if (player.hasPermission(aliasObject.adminPermission.replace("", alias.toLowerCase()))){ if (aliasObject.adminCommandEnable) { subAliasAdminCommand(aliasObject, alias, player, args); } diff --git a/src/main/java/net/t2code/alias/Spigot/system/AliasRegisterPermissions.java b/src/main/java/net/t2code/alias/Spigot/system/AliasRegisterPermissions.java index 1dce6d8..30284b4 100644 --- a/src/main/java/net/t2code/alias/Spigot/system/AliasRegisterPermissions.java +++ b/src/main/java/net/t2code/alias/Spigot/system/AliasRegisterPermissions.java @@ -11,20 +11,25 @@ public class AliasRegisterPermissions { public static void onPermRegister() { for (AliasObject aliasObject : Main.aliasHashMap.values()) { - if (Bukkit.getPluginManager().getPermission(aliasObject.permission.toLowerCase()) == null) { - T2Cregister.permission(aliasObject.permission.toLowerCase(), Main.getPlugin()); - } - if (Bukkit.getPluginManager().getPermission(aliasObject.adminPermission.toLowerCase()) == null) { - T2Cregister.permission(aliasObject.adminPermission.toLowerCase(), Main.getPlugin()); + + for (String alias : aliasObject.aliasList){ + if (Bukkit.getPluginManager().getPermission(aliasObject.permission.replace("",alias).toLowerCase()) == null) { + T2Cregister.permission(aliasObject.permission.replace("",alias).toLowerCase(), Main.getPlugin()); + } + if (Bukkit.getPluginManager().getPermission(aliasObject.adminPermission.replace("",alias).toLowerCase()) == null) { + T2Cregister.permission(aliasObject.adminPermission.replace("",alias).toLowerCase(), Main.getPlugin()); + } } } for (SubAliasObject subAliasObject : Main.subAliasHashMap.values()) { - if (Bukkit.getPluginManager().getPermission(subAliasObject.permission.toLowerCase()) == null) { - T2Cregister.permission(subAliasObject.permission.toLowerCase(), Main.getPlugin()); - } - if (Bukkit.getPluginManager().getPermission(subAliasObject.adminPermission.toLowerCase()) == null) { - T2Cregister.permission(subAliasObject.adminPermission.toLowerCase(), Main.getPlugin()); + for (String alias : subAliasObject.subAliasList){ + if (Bukkit.getPluginManager().getPermission(subAliasObject.permission.replace("",alias).toLowerCase()) == null) { + T2Cregister.permission(subAliasObject.permission.replace("",alias).toLowerCase(), Main.getPlugin()); + } + if (Bukkit.getPluginManager().getPermission(subAliasObject.adminPermission.replace("",alias).toLowerCase()) == null) { + T2Cregister.permission(subAliasObject.adminPermission.replace("",alias).toLowerCase(), Main.getPlugin()); + } } } } diff --git a/src/main/java/net/t2code/alias/Spigot/system/Metrics.java b/src/main/java/net/t2code/alias/Spigot/system/Metrics.java index 7564769..efcf5f3 100644 --- a/src/main/java/net/t2code/alias/Spigot/system/Metrics.java +++ b/src/main/java/net/t2code/alias/Spigot/system/Metrics.java @@ -2,7 +2,6 @@ package net.t2code.alias.Spigot.system; - import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; diff --git a/src/main/resources/Alias/X_aliasDeclaration_X.yml b/src/main/resources/Alias/X_aliasDeclaration_X.yml index a4a7ba2..295cf98 100644 --- a/src/main/resources/Alias/X_aliasDeclaration_X.yml +++ b/src/main/resources/Alias/X_aliasDeclaration_X.yml @@ -78,6 +78,8 @@ Alias: # Here you can enable or disable the admin function Enable: false # Here you set the permission for the admin function + # The placeholder is the alias name. + # If you have set multiple alias referrers in the list 'Alias.AliasList' you have a permission for each alias. Permission: t2code.alias.admin Command: # Here you can tell the alias to execute one or more commands diff --git a/src/main/resources/SubAlias/X_subAliasDeclaration_X.yml b/src/main/resources/SubAlias/X_subAliasDeclaration_X.yml index c0f8190..cb2b607 100644 --- a/src/main/resources/SubAlias/X_subAliasDeclaration_X.yml +++ b/src/main/resources/SubAlias/X_subAliasDeclaration_X.yml @@ -20,7 +20,7 @@ SubAlias: Necessary: true # Here you can set the permission for the alias. # The placeholder is the alias name. - # If you have set multiple alias referrers in the list 'Alias.AliasList' you have a permission for each alias. + # If you have set multiple alias referrers in the list 'Alias.SubAliasList' you have a permission for each alias. Permission: 't2code.alias.use.subalias.' # Here you can set a custom No Permission message for this alias. If you want to use the default message, just leave this blank. CustomNoPermissionMSG: "" @@ -82,6 +82,8 @@ SubAlias: # Here you can enable or disable the admin function Enable: false # Here you set the permission for the admin function + # The placeholder is the alias name. + # If you have set multiple alias referrers in the list 'Alias.SubAliasList' you have a permission for each alias. Permission: t2code.alias.admin Command: # Here you can tell the alias to execute one or more commands