diff options
| author | snowleo <schneeleo@gmail.com> | 2012-04-05 17:05:43 +0200 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2012-04-05 17:05:43 +0200 |
| commit | f73a5d0e8d370c1273685533b44ce526d9d8cdef (patch) | |
| tree | 64f106d2442f8b84a8ff14b5fdf056a581d2dc24 /EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java | |
| parent | aa437030945a59a0cbfe7d940f36135e40072b30 (diff) | |
| parent | f7bc04bc347c088d35ee5a939c026f28b2ce0c19 (diff) | |
| download | Essentials-f73a5d0e8d370c1273685533b44ce526d9d8cdef.tar Essentials-f73a5d0e8d370c1273685533b44ce526d9d8cdef.tar.gz Essentials-f73a5d0e8d370c1273685533b44ce526d9d8cdef.tar.lz Essentials-f73a5d0e8d370c1273685533b44ce526d9d8cdef.tar.xz Essentials-f73a5d0e8d370c1273685533b44ce526d9d8cdef.zip | |
Merge remote-tracking branch 'origin/groupmanager'
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java')
| -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); + } + } } } |