diff options
author | ElgarL <ElgarL@palmergames.com> | 2012-04-03 14:30:27 +0100 |
---|---|---|
committer | ElgarL <ElgarL@palmergames.com> | 2012-04-03 14:30:27 +0100 |
commit | 77e15e9330e9f18b3e30ace012cbeb1f208f4911 (patch) | |
tree | 9c3b0aa18cebc318ed0a15fafbbf0df9ac84cd2a | |
parent | 99e315e625052d68fc5932cabf52e10b601fdb09 (diff) | |
download | Essentials-77e15e9330e9f18b3e30ace012cbeb1f208f4911.tar Essentials-77e15e9330e9f18b3e30ace012cbeb1f208f4911.tar.gz Essentials-77e15e9330e9f18b3e30ace012cbeb1f208f4911.tar.lz Essentials-77e15e9330e9f18b3e30ace012cbeb1f208f4911.tar.xz Essentials-77e15e9330e9f18b3e30ace012cbeb1f208f4911.zip |
Prevent Null entries in group inheritance from throwing errors.
-rw-r--r-- | EssentialsGroupManager/src/Changelog.txt | 3 | ||||
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index fd9d8ef35..eba17517c 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -159,4 +159,5 @@ v 1.9: - Catch errors caused by bad indentation in yml's.
- Force remove player attachments on disconnect, and tidyup during player join in case of any errors. Fixes a bug of losing permissions.
- Added a new permission node 'groupmanager.op'. This will cause players with this node to be treated as op's when
- using GroupManager commands (they will still require each commands permission node to use them).
\ No newline at end of file + using GroupManager commands (they will still require each commands permission node to use them).
+ - Prevent Null entries in group inheritance from throwing errors.
\ No newline at end of file diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java index d7f146438..cee2ec0b8 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java @@ -563,10 +563,12 @@ public class WorldDataHolder { List<String> inheritedList = inheritance.get(groupKey); Group thisGroup = ph.getGroup(groupKey); for (String inheritedKey : inheritedList) { - Group inheritedGroup = ph.getGroup(inheritedKey); - if (thisGroup != null && inheritedGroup != null) { - thisGroup.addInherits(inheritedGroup); - } + if (inheritedKey != null) { + Group inheritedGroup = ph.getGroup(inheritedKey); + if (thisGroup != null && inheritedGroup != null) { + thisGroup.addInherits(inheritedGroup); + } + } } } |