Browse Source

Nothing changed.

master
Stanislav Usenkov 9 years ago
parent
commit
e6ee508360
  1. 8
      src/main/java/ru/simsonic/rscPermissions/Bukkit/WorldEditPermissions.java
  2. 4
      src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java
  3. 8
      src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionResult.java

8
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.printDebugString("Looking for permission: {_LG}" + permission);
bridge.printDebugStackTrace(); bridge.printDebugStackTrace();
return rscp.permissionManager.getResult(player).hasPermissionWC(permission); return rscp.permissionManager.getResult(player).hasPermissionWildcard(permission);
} }
@Override @Override
@Deprecated @Deprecated
@ -52,7 +52,7 @@ public final class WorldEditPermissions implements Plugin, PermissionsResolver
{ {
bridge.printDebugString("Looking for permission: {_LG}" + permission); bridge.printDebugString("Looking for permission: {_LG}" + permission);
bridge.printDebugStackTrace(); bridge.printDebugStackTrace();
return rscp.permissionManager.getResult(player).hasPermissionWC(permission); return rscp.permissionManager.getResult(player).hasPermissionWildcard(permission);
} }
@Override @Override
@Deprecated @Deprecated
@ -60,7 +60,7 @@ public final class WorldEditPermissions implements Plugin, PermissionsResolver
{ {
bridge.printDebugString("Looking for permission: {_LG}" + permission); bridge.printDebugString("Looking for permission: {_LG}" + permission);
bridge.printDebugStackTrace(); bridge.printDebugStackTrace();
return rscp.permissionManager.getResult(player).hasPermissionWC(permission); return rscp.permissionManager.getResult(player).hasPermissionWildcard(permission);
} }
@Override @Override
@Deprecated @Deprecated
@ -68,7 +68,7 @@ public final class WorldEditPermissions implements Plugin, PermissionsResolver
{ {
bridge.printDebugString("Looking for permission: {_LG}" + permission); bridge.printDebugString("Looking for permission: {_LG}" + permission);
bridge.printDebugStackTrace(); bridge.printDebugStackTrace();
return rscp.permissionManager.getResult(player).hasPermissionWC(permission); return rscp.permissionManager.getResult(player).hasPermissionWildcard(permission);
} }
@Override @Override
public boolean inGroup(OfflinePlayer player, String group) public boolean inGroup(OfflinePlayer player, String group)

4
src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java

@ -21,8 +21,8 @@ public class InternalCache extends InternalStorage
private boolean groupsInheritParentPrefixes = true; private boolean groupsInheritParentPrefixes = true;
public void setDefaultGroup(String defaultGroup, boolean alwaysInheritDefaultGroup, boolean groupsInheritParentPrefixes) public void setDefaultGroup(String defaultGroup, boolean alwaysInheritDefaultGroup, boolean groupsInheritParentPrefixes)
{ {
defaultInheritance.parent = defaultGroup; super.defaultInheritance.parent = defaultGroup;
defaultInheritance.deriveInstance(); super.defaultInheritance.deriveInstance();
this.alwaysInheritDefaultGroup = alwaysInheritDefaultGroup; this.alwaysInheritDefaultGroup = alwaysInheritDefaultGroup;
this.groupsInheritParentPrefixes = groupsInheritParentPrefixes; this.groupsInheritParentPrefixes = groupsInheritParentPrefixes;
} }

8
src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionResult.java

@ -9,11 +9,11 @@ import ru.simsonic.rscPermissions.API.Settings;
public class ResolutionResult public class ResolutionResult
{ {
public String prefix = ""; public String prefix = "";
public String suffix = ""; public String suffix = "";
public ResolutionParams params; public ResolutionParams params;
public Map<String, Boolean> permissions; public Map<String, Boolean> permissions;
protected List<String> groups; protected List<String> groups;
public boolean hasPermission(String permission) public boolean hasPermission(String permission)
{ {
for(Map.Entry<String, Boolean> entry : permissions.entrySet()) for(Map.Entry<String, Boolean> entry : permissions.entrySet())
@ -21,7 +21,7 @@ public class ResolutionResult
return entry.getValue(); return entry.getValue();
return false; return false;
} }
public boolean hasPermissionWC(String permission) public boolean hasPermissionWildcard(String permission)
{ {
for(Map.Entry<String, Boolean> entry : permissions.entrySet()) for(Map.Entry<String, Boolean> entry : permissions.entrySet())
{ {

Loading…
Cancel
Save