TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-07-15 16:56:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'refs/heads/groupmanager' into 2.9

Browse source
This commit is contained in:
snowleo 2012-08-07 20:13:27 +02:00
parent 54133cd75e 72aeec58ed
commit 738b895cba
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -161,7 +161,11 @@ public class GlobalGroups {
Object element;
// Permission nodes
element = ((Map<String, Object>)allGroups.get(groupName)).get("permissions");
try {
element = ((Map<String, Object>)allGroups.get(groupName)).get("permissions");
} catch ( Exception ex) {
throw new IllegalArgumentException("The GlobalGroup ' " + groupName + "' is formatted incorrectly: ", ex);
}
if (element != null)
if (element instanceof List) {
@ -180,7 +184,11 @@ public class GlobalGroups {
throw new IllegalArgumentException("Unknown type of permission node for global group: " + groupName);
// Info nodes
element = ((Map<String, Object>)allGroups.get(groupName)).get("info");
try {
element = ((Map<String, Object>)allGroups.get(groupName)).get("info");
} catch ( Exception ex) {
throw new IllegalArgumentException("The GlobalGroup ' " + groupName + "' is formatted incorrectly: ", ex);
}
if (element != null)
if (element instanceof MemorySection) {