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 | ebfab2c9fe31bd5a5b92ac1bf5575e760738d23e (patch) | |
| tree | cb62fa7f2172d3bac8f139d4f291eba29b14add6 /EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder | |
| parent | 5ad8f0ee8eb4e6b5c753de2ee4bba4f82511e57c (diff) | |
| download | Essentials-ebfab2c9fe31bd5a5b92ac1bf5575e760738d23e.tar Essentials-ebfab2c9fe31bd5a5b92ac1bf5575e760738d23e.tar.gz Essentials-ebfab2c9fe31bd5a5b92ac1bf5575e760738d23e.tar.lz Essentials-ebfab2c9fe31bd5a5b92ac1bf5575e760738d23e.tar.xz Essentials-ebfab2c9fe31bd5a5b92ac1bf5575e760738d23e.zip | |
Prevent Null entries in group inheritance from throwing errors.
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder')
| -rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java | 10 |
1 files changed, 6 insertions, 4 deletions
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); + } + } } } |