TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-15 05:33:40 +00:00
Code Issues Projects Releases Wiki Activity

Fix for GM not checking inheritance for known superperms nodes.

Browse source
This commit is contained in:
ElgarL 2011-09-26 21:24:12 +01:00
parent 62e1710607
commit 1d38b72835
2 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
EssentialsGroupManager/src/Changelog.txt
View file

@ -20,3 +20,4 @@ v 1.1:
- manucheckp also outputs superperms results. - manucheckp also outputs superperms results.
- Removed superperms update on plugins unloading. Unneeded and created undesired lag on shutdown. - Removed superperms update on plugins unloading. Unneeded and created undesired lag on shutdown.
- Added a BukkitPermsUpdateTask to only update superperms once on a load/reload. - Added a BukkitPermsUpdateTask to only update superperms once on a load/reload.
- Fix for GM not checking inheritance for known superperms nodes.

23
EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
View file

@ -16,8 +16,6 @@
package org.anjocaido.groupmanager.permissions; package org.anjocaido.groupmanager.permissions;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@ -28,7 +26,6 @@ import java.util.Set;
import org.anjocaido.groupmanager.GroupManager; import org.anjocaido.groupmanager.GroupManager;
import org.anjocaido.groupmanager.data.User; import org.anjocaido.groupmanager.data.User;
import org.anjocaido.groupmanager.dataholder.OverloadedWorldHolder; import org.anjocaido.groupmanager.dataholder.OverloadedWorldHolder;
import org.anjocaido.groupmanager.utils.PermissionCheckResult;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -134,14 +131,9 @@ public class BukkitPermissions {
} }
// find matching permissions // find matching permissions
PermissionCheckResult permissionResult;
Boolean value; Boolean value;
for (Permission permission : registeredPermissions) { for (Permission permission : registeredPermissions) {
permissionResult = worldData.getPermissionsHandler().checkFullUserPermission(user, permission.getName()); value = worldData.getPermissionsHandler().checkUserPermission(user, permission.getName());
if (permissionResult.resultType.equals(PermissionCheckResult.Type.FOUND))
value = true;
else
value = false;
attachment.setPermission(permission, value); attachment.setPermission(permission, value);
} }
@ -161,19 +153,6 @@ public class BukkitPermissions {
} }
} }
player.recalculatePermissions(); player.recalculatePermissions();
/*
// List perms for this player
GroupManager.logger.info("Attachment Permissions:");
for(Map.Entry<String, Boolean> entry : attachment.getPermissions().entrySet()){
GroupManager.logger.info(" " + entry.getKey() + " = " + entry.getValue());
}
GroupManager.logger.info("Effective Permissions:");
for(PermissionAttachmentInfo info : player.getEffectivePermissions()){
GroupManager.logger.info(" " + info.getPermission() + " = " + info.getValue());
}
*/
} }
public List<String> listPerms(Player player) { public List<String> listPerms(Player player) {