From e6ee5083609e8d16201993a52e6122e67c8abdc7 Mon Sep 17 00:00:00 2001 From: Stanislav Usenkov Date: Thu, 7 Jul 2016 14:02:47 +0600 Subject: [PATCH] Nothing changed. --- .../rscPermissions/Bukkit/WorldEditPermissions.java | 8 ++++---- .../ru/simsonic/rscPermissions/Engine/InternalCache.java | 4 ++-- .../simsonic/rscPermissions/Engine/ResolutionResult.java | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/WorldEditPermissions.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/WorldEditPermissions.java index f7cf304..7cbd89e 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/WorldEditPermissions.java +++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/WorldEditPermissions.java @@ -44,7 +44,7 @@ public final class WorldEditPermissions implements Plugin, PermissionsResolver { bridge.printDebugString("Looking for permission: {_LG}" + permission); bridge.printDebugStackTrace(); - return rscp.permissionManager.getResult(player).hasPermissionWC(permission); + return rscp.permissionManager.getResult(player).hasPermissionWildcard(permission); } @Override @Deprecated @@ -52,7 +52,7 @@ public final class WorldEditPermissions implements Plugin, PermissionsResolver { bridge.printDebugString("Looking for permission: {_LG}" + permission); bridge.printDebugStackTrace(); - return rscp.permissionManager.getResult(player).hasPermissionWC(permission); + return rscp.permissionManager.getResult(player).hasPermissionWildcard(permission); } @Override @Deprecated @@ -60,7 +60,7 @@ public final class WorldEditPermissions implements Plugin, PermissionsResolver { bridge.printDebugString("Looking for permission: {_LG}" + permission); bridge.printDebugStackTrace(); - return rscp.permissionManager.getResult(player).hasPermissionWC(permission); + return rscp.permissionManager.getResult(player).hasPermissionWildcard(permission); } @Override @Deprecated @@ -68,7 +68,7 @@ public final class WorldEditPermissions implements Plugin, PermissionsResolver { bridge.printDebugString("Looking for permission: {_LG}" + permission); bridge.printDebugStackTrace(); - return rscp.permissionManager.getResult(player).hasPermissionWC(permission); + return rscp.permissionManager.getResult(player).hasPermissionWildcard(permission); } @Override public boolean inGroup(OfflinePlayer player, String group) diff --git a/src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java b/src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java index d82e9d6..480951c 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java +++ b/src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java @@ -21,8 +21,8 @@ public class InternalCache extends InternalStorage private boolean groupsInheritParentPrefixes = true; public void setDefaultGroup(String defaultGroup, boolean alwaysInheritDefaultGroup, boolean groupsInheritParentPrefixes) { - defaultInheritance.parent = defaultGroup; - defaultInheritance.deriveInstance(); + super.defaultInheritance.parent = defaultGroup; + super.defaultInheritance.deriveInstance(); this.alwaysInheritDefaultGroup = alwaysInheritDefaultGroup; this.groupsInheritParentPrefixes = groupsInheritParentPrefixes; } diff --git a/src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionResult.java b/src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionResult.java index 88e2c9e..e88f9f2 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionResult.java +++ b/src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionResult.java @@ -9,11 +9,11 @@ import ru.simsonic.rscPermissions.API.Settings; public class ResolutionResult { - public String prefix = ""; - public String suffix = ""; + public String prefix = ""; + public String suffix = ""; public ResolutionParams params; public Map permissions; - protected List groups; + protected List groups; public boolean hasPermission(String permission) { for(Map.Entry entry : permissions.entrySet()) @@ -21,7 +21,7 @@ public class ResolutionResult return entry.getValue(); return false; } - public boolean hasPermissionWC(String permission) + public boolean hasPermissionWildcard(String permission) { for(Map.Entry entry : permissions.entrySet()) {