diff options
author | KHobbits <rob@khobbits.co.uk> | 2012-04-05 23:37:33 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2012-04-05 23:37:33 +0100 |
commit | 6a75d6fe86c78d2f5b5b3716291b7b81171b330e (patch) | |
tree | 33d31861f9854348d54225405aa282d617080dab /EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java | |
parent | bc876611d0df5be116c280996add50725083142c (diff) | |
parent | 798ea777365d13a8970e4c55c2fafefefd1e166a (diff) | |
download | Essentials-6a75d6fe86c78d2f5b5b3716291b7b81171b330e.tar Essentials-6a75d6fe86c78d2f5b5b3716291b7b81171b330e.tar.gz Essentials-6a75d6fe86c78d2f5b5b3716291b7b81171b330e.tar.lz Essentials-6a75d6fe86c78d2f5b5b3716291b7b81171b330e.tar.xz Essentials-6a75d6fe86c78d2f5b5b3716291b7b81171b330e.zip |
Merge branch 'master' of github.com:essentials/Essentials
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); + } + } } } |