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

Prevent null perms getting past the GlobalGroups loader.

Browse source
This commit is contained in:
ElgarL 2012-04-18 22:22:35 +01:00
parent 6ac8abdac8
commit cd7bf5eff2
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
EssentialsGroupManager/src/Changelog.txt
View file

@ -180,4 +180,5 @@ v 2.0:
- Update all code formatting to use tabs for indentation. - Update all code formatting to use tabs for indentation.
- Stop using our own deprecated methods as we tell others to do. - Stop using our own deprecated methods as we tell others to do.
- Finally remove all deprecated methods. - Finally remove all deprecated methods.
- Re-initialize the WorldsHolder on a reload, as un-registering and re-registering a new holder means all plugins have to check for the new service on every quiery. - Re-initialize the WorldsHolder on a reload, as un-registering and re-registering a new holder means all plugins have to check for the new service on every quiery.
- Prevent null perms getting past the GlobalGroups loader.

4
EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java
View file

@ -159,12 +159,14 @@ public class GlobalGroups {
if (element instanceof List) { if (element instanceof List) {
try { try {
for (String node : (List<String>) element) { for (String node : (List<String>) element) {
newGroup.addPermission(node); if ((node != null) && !node.isEmpty())
newGroup.addPermission(node);
} }
} catch (ClassCastException ex) { } catch (ClassCastException ex) {
throw new IllegalArgumentException("Invalid permission node for global group: " + groupName, ex); throw new IllegalArgumentException("Invalid permission node for global group: " + groupName, ex);
} }
} else if (element instanceof String) { } else if (element instanceof String) {
if ((element != null) && !((String)element).isEmpty())
newGroup.addPermission((String) element); newGroup.addPermission((String) element);
} else } else
throw new IllegalArgumentException("Unknown type of permission node for global group: " + groupName); throw new IllegalArgumentException("Unknown type of permission node for global group: " + groupName);