TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-12 04:20:41 +00:00
Code Issues Projects Releases Wiki Activity

v 1.9:

Browse source 
Optimize populating Bukkit perms so we no longer calculate the
child
nodes (Bukkit already does this).
This commit is contained in:
ElgarL 2012-01-17 18:03:16 +00:00
parent 1a0b03db4d
commit 89c41b0508
5 changed files with 58 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
EssentialsGroupManager/src/Changelog.txt
View file

@ -102,3 +102,5 @@ v 1.8:
You can now mirror groups.yml, users.yml or both files between different worlds.
- Catch NullPointerErrors generated by blank permission nodes.
- Removed '- bukkit.command' form the globalgroups permission nodes.
v 1.9:
- Optimize populating Bukkit perms so we no longer calculate the child nodes (Bukkit already does this).

19
EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java
View file

@ -90,13 +90,24 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
/**
* Returns All permissions (including inheritance and sub groups) for the
* player.
* player, including child nodes from Bukkit.
*
* @param userName
* @return List<String> of all players permissions.
*/
@Override
public List<String> getAllPlayersPermissions(String userName) {
return getAllPlayersPermissions(userName, true);
}
/**
* Returns All permissions (including inheritance and sub groups) for the
* player. With or without Bukkit child nodes.
*
* @param userName
* @return List<String> of all players permissions.
*/
@Override
public List<String> getAllPlayersPermissions(String userName, Boolean includeChildren) {
List<String> playerPermArray = new ArrayList<String>();
@ -104,6 +115,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
if ((!playerPermArray.contains(perm)) && (!playerPermArray.contains("-" + perm))) {
playerPermArray.add(perm);
if (includeChildren) {
Map<String, Boolean> children = GroupManager.BukkitPermissions.getAllChildren(perm, playerPermArray);
if (children != null) {
@ -116,12 +128,14 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
}
}
}
}
for (String group : getGroups(userName)) {
if (group.startsWith("g:") && GroupManager.getGlobalGroups().hasGroup(group)) {
for (String perm : GroupManager.getGlobalGroups().getGroupsPermissions(group)) {
if ((!playerPermArray.contains(perm)) && (!playerPermArray.contains("-" + perm))) {
playerPermArray.add(perm);
if (includeChildren) {
Map<String, Boolean> children = GroupManager.BukkitPermissions.getAllChildren(perm, playerPermArray);
if (children != null) {
for (String child : children.keySet()) {
@ -132,11 +146,13 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
}
}
}
}
} else {
for (String perm : ph.getGroup(group).getPermissionList()) {
if ((!playerPermArray.contains(perm)) && (!playerPermArray.contains("-" + perm))) {
playerPermArray.add(perm);
if (includeChildren) {
Map<String, Boolean> children = GroupManager.BukkitPermissions.getAllChildren(perm, playerPermArray);
if (children != null) {
for (String child : children.keySet()) {
@ -150,6 +166,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
}
}
}
}
// Collections.sort(playerPermArray,
// StringPermissionComparator.getInstance());

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

@ -79,7 +79,7 @@ public class BukkitPermissions {
public BukkitPermissions(GroupManager plugin) {
this.plugin = plugin;
//this.collectPermissions();
this.collectPermissions();
this.registerEvents();
this.updateAllPlayers();
@ -105,16 +105,21 @@ public class BukkitPermissions {
manager.registerEvent(Event.Type.PLUGIN_DISABLE, serverListener, Event.Priority.Normal, plugin);
}
/*
public void collectPermissions() {
registeredPermissions.clear();
/*
for (Plugin bukkitPlugin : Bukkit.getServer().getPluginManager().getPlugins()) {
for (Permission permission : bukkitPlugin.getDescription().getPermissions())
registeredPermissions.push(permission);
}
}
*/
registeredPermissions = new LinkedList<Permission>(Bukkit.getPluginManager().getPermissions());
}
public void updatePermissions(Player player) {
this.updatePermissions(player, null);
}
@ -194,7 +199,7 @@ public class BukkitPermissions {
// Add all permissions for this player (GM only)
// child nodes will be calculated by Bukkit.
List<String> playerPermArray = worldData.getPermissionsHandler().getAllPlayersPermissions(player.getName());
List<String> playerPermArray = worldData.getPermissionsHandler().getAllPlayersPermissions(player.getName(), false);
Map<String, Boolean> newPerms = new HashMap<String, Boolean>();
for (String permission : playerPermArray) {
@ -210,6 +215,7 @@ public class BukkitPermissions {
*/
newPerms.put(permission, value);
}
//player.recalculatePermissions();
/**
@ -373,13 +379,13 @@ public class BukkitPermissions {
if (!GroupManager.isLoaded())
return;
//collectPermissions();
collectPermissions();
updateAllPlayers();
}
@Override
public void onPluginDisable(PluginDisableEvent event) {
// collectPermissions();
collectPermissions();
// updateAllPlayers();
}
}

2
EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/PermissionsReaderInterface.java
View file

@ -234,4 +234,6 @@ public abstract class PermissionsReaderInterface {
//////////////////////////////
public abstract List<String> getAllPlayersPermissions(String userName);
public abstract List<String> getAllPlayersPermissions(String userName, Boolean includeChildren);
}

3
EssentialsGroupManager/src/plugin.yml
View file

@ -1,11 +1,12 @@
name: GroupManager
version: "1.8 (Phoenix)"
version: GMBuildVer (Phoenix)
main: org.anjocaido.groupmanager.GroupManager
website: http://www.anjocaido.info/
description: Provides on-the-fly system for permissions system created by Nijikokun. But all in memory, and with flat-file saving schedule.
authors:
- AnjoCaido
- Gabriel Couto
- ElgarL
commands:
manuadd:
description: Move a player to desired group.(Adds to the file if not exists)