summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src
diff options
context:
space:
mode:
authorElgarL <ElgarL@palmergames.com>2012-04-03 14:30:27 +0100
committerElgarL <ElgarL@palmergames.com>2012-04-03 14:30:27 +0100
commit183602ac28d1e195cdd71e17dc5fc26f70f3a074 (patch)
treeef25025bffc3015d1ad24bf3ad875d6542d4af80 /EssentialsGroupManager/src
parente2e51c9c95f95906ad370bee7bcf698918b9a20b (diff)
downloadEssentials-183602ac28d1e195cdd71e17dc5fc26f70f3a074.tar
Essentials-183602ac28d1e195cdd71e17dc5fc26f70f3a074.tar.gz
Essentials-183602ac28d1e195cdd71e17dc5fc26f70f3a074.tar.lz
Essentials-183602ac28d1e195cdd71e17dc5fc26f70f3a074.tar.xz
Essentials-183602ac28d1e195cdd71e17dc5fc26f70f3a074.zip
Prevent Null entries in group inheritance from throwing errors.
Diffstat (limited to 'EssentialsGroupManager/src')
-rw-r--r--EssentialsGroupManager/src/Changelog.txt3
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java10
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);
+ }
+ }
}
}