diff options
| -rw-r--r-- | Essentials/src/net/ess3/utils/Util.java | 38 | ||||
| -rw-r--r-- | EssentialsProtect/src/net/ess3/protect/Permissions.java | 3 |
2 files changed, 2 insertions, 39 deletions
diff --git a/Essentials/src/net/ess3/utils/Util.java b/Essentials/src/net/ess3/utils/Util.java index 734ba921f..23d334638 100644 --- a/Essentials/src/net/ess3/utils/Util.java +++ b/Essentials/src/net/ess3/utils/Util.java @@ -292,44 +292,6 @@ public final class Util basePerm.recalculatePermissibles(); } - private static transient final Pattern DOT_PATTERN = Pattern.compile("\\."); - public static Permission registerPermission(String permission, PermissionDefault defaultPerm) - { - final PluginManager pluginManager = Bukkit.getServer().getPluginManager(); - final String[] parts = DOT_PATTERN.split(permission); - final StringBuilder builder = new StringBuilder(permission.length()); - Permission parent = null; - for (int i = 0; i < parts.length - 1; i++) - { - builder.append(parts[i]).append(".*"); - String permString = builder.toString(); - Permission perm = pluginManager.getPermission(permString); - if (perm == null) - { - perm = new Permission(permString, PermissionDefault.FALSE); - pluginManager.addPermission(perm); - if (parent != null) - { - parent.getChildren().put(perm.getName(), Boolean.TRUE); - } - parent = perm; - } - builder.deleteCharAt(builder.length() - 1); - } - Permission perm = pluginManager.getPermission(permission); - if (perm == null) - { - perm = new Permission(permission, defaultPerm); - pluginManager.addPermission(perm); - if (parent != null) - { - parent.getChildren().put(perm.getName(), Boolean.TRUE); - } - parent = perm; - } - perm.recalculatePermissibles(); - return perm; - } private static transient final Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-z]{2,3}(?:/\\S+)?)"); private static transient final Pattern VANILLA_PATTERN = Pattern.compile("\u00A7+[0-9A-FK-ORa-fk-or]"); private static transient final Pattern REPLACE_PATTERN = Pattern.compile("&([0-9a-fk-or])"); diff --git a/EssentialsProtect/src/net/ess3/protect/Permissions.java b/EssentialsProtect/src/net/ess3/protect/Permissions.java index 7a0dd3b7e..66c7b1c55 100644 --- a/EssentialsProtect/src/net/ess3/protect/Permissions.java +++ b/EssentialsProtect/src/net/ess3/protect/Permissions.java @@ -2,6 +2,7 @@ package net.ess3.protect; import java.util.Locale; import net.ess3.api.IPermission; +import net.ess3.bukkit.PermissionFactory; import net.ess3.utils.Util; import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permission; @@ -63,7 +64,7 @@ public enum Permissions implements IPermission } else { - return Util.registerPermission(getPermissionName(), getPermissionDefault()); + return PermissionFactory.registerPermission(getPermissionName(), getPermissionDefault()); } } |