mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-02-12 12:23:59 +00:00
Merge branch 'refs/heads/2.9' into release
This commit is contained in:
commit
733fcc9d87
1 changed files with 10 additions and 2 deletions
|
@ -161,7 +161,11 @@ public class GlobalGroups {
|
||||||
Object element;
|
Object element;
|
||||||
|
|
||||||
// Permission nodes
|
// Permission nodes
|
||||||
|
try {
|
||||||
element = ((Map<String, Object>)allGroups.get(groupName)).get("permissions");
|
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 != null)
|
||||||
if (element instanceof List) {
|
if (element instanceof List) {
|
||||||
|
@ -180,7 +184,11 @@ public class GlobalGroups {
|
||||||
throw new IllegalArgumentException("Unknown type of permission node for global group: " + groupName);
|
throw new IllegalArgumentException("Unknown type of permission node for global group: " + groupName);
|
||||||
|
|
||||||
// Info nodes
|
// Info nodes
|
||||||
|
try {
|
||||||
element = ((Map<String, Object>)allGroups.get(groupName)).get("info");
|
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 != null)
|
||||||
if (element instanceof MemorySection) {
|
if (element instanceof MemorySection) {
|
||||||
|
|
Loading…
Reference in a new issue