From 183602ac28d1e195cdd71e17dc5fc26f70f3a074 Mon Sep 17 00:00:00 2001
From: ElgarL <ElgarL@palmergames.com>
Date: Tue, 3 Apr 2012 14:30:27 +0100
Subject: Prevent Null entries in group inheritance from throwing errors.

---
 .../org/anjocaido/groupmanager/dataholder/WorldDataHolder.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java')

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);
+	                }
+            	}
             }
         }
         
-- 
cgit v1.2.3