From 64af5b465dbb7fc41d03a49cfd7c331beb389c0e Mon Sep 17 00:00:00 2001 From: ElgarL Date: Wed, 18 Jan 2012 01:25:25 +0000 Subject: Added a tidy error message for invalid permission entries in GlobalGroups. --- EssentialsGroupManager/src/Changelog.txt | 3 ++- .../src/org/anjocaido/groupmanager/GlobalGroups.java | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'EssentialsGroupManager') diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index 876dc28b7..741777748 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -103,4 +103,5 @@ v 1.8: - 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). \ No newline at end of file + - Optimize populating Bukkit perms so we no longer calculate the child nodes (Bukkit already does this). + - Added a tidy error message for invalid permission entries in GlobalGroups. \ No newline at end of file diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java index f1bf10985..d9715d4be 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java @@ -125,8 +125,12 @@ public class GlobalGroups { if (element != null) if (element instanceof List) { - for (String node : (List) element) { - newGroup.addPermission(node); + try { + for (String node : (List) element) { + newGroup.addPermission(node); + } + } catch (ClassCastException e) { + throw new IllegalArgumentException("Invalid permission node for global group: " + groupName); } } else if (element instanceof String) { newGroup.addPermission((String) element); -- cgit v1.2.3