From cb0b621e87d1bd34fd273b9e9dc05ae5f6534cd6 Mon Sep 17 00:00:00 2001
From: ElgarL <ElgarL@palmergames.com>
Date: Wed, 9 Jan 2013 04:27:10 +0000
Subject: Remove attachments BEFORE we clear them.

---
 .../groupmanager/permissions/BukkitPermissions.java    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'EssentialsGroupManager')

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
index 4d9e0ba1c..6b02a2286 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
@@ -104,14 +104,6 @@ public class BukkitPermissions {
 	
 	public void reset() {
 		
-		/*
-		 * Remove all attachments.
-		 */
-		for (String key : attachments.keySet()) {
-			attachments.get(key).remove();
-			attachments.remove(key);
-		}
-		
 		/*
 		 * collect new permissions
 		 * and register all attachments.
@@ -395,8 +387,10 @@ public class BukkitPermissions {
 	 */
 	private void removeAttachment(String playerName) {
 
-		if (attachments.containsKey(playerName))
+		if (attachments.containsKey(playerName)) {
+			attachments.get(playerName).remove();
 			attachments.remove(playerName);
+		}
 	}
 
 	/**
@@ -404,6 +398,12 @@ public class BukkitPermissions {
 	 */
 	public void removeAllAttachments() {
 
+		/*
+		 * Remove all attachments.
+		 */
+		for (String key : attachments.keySet()) {
+			attachments.get(key).remove();
+		}
 		attachments.clear();
 	}
 
-- 
cgit v1.2.3