Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-08 03:50:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'refs/heads/2.9' into release

Browse Source
This commit is contained in:
snowleo 2012-08-07 21:11:34 +02:00
commit 733fcc9d87
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) {