From bd7af593e7e77df0d59f32cf5b3b7d4170682af3 Mon Sep 17 00:00:00 2001
From: ElgarL <ElgarL@palmergames.com>
Date: Thu, 5 Apr 2012 21:06:48 +0100
Subject: Don't throw errors when attempting to remove permission attachments
 (bukkit will have already removed it).

---
 .../anjocaido/groupmanager/permissions/BukkitPermissions.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java')

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
index 5c711351e..6df18cb05 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
@@ -351,7 +351,14 @@ public class BukkitPermissions {
 	 */
 	private void removeAttachment(Player player) {
 		if (attachments.containsKey(player)) {
-			player.removeAttachment(attachments.get(player));
+			try {
+				player.removeAttachment(attachments.get(player));
+			} catch (IllegalArgumentException e) {
+				/*
+				 * Failed to remove attachment
+				 * This usually means Bukkit no longer know of it.
+				 */
+			}
 			attachments.remove(player);
 		}
 	}
-- 
cgit v1.2.3


From 25bd91eb807e19db9d045c8e5f4ee70ec085da33 Mon Sep 17 00:00:00 2001
From: ElgarL <ElgarL@palmergames.com>
Date: Fri, 6 Apr 2012 12:53:36 +0100
Subject: Remove all permission attachments when performing a manload or
 restart.

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

(limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java')

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
index 6df18cb05..3b66c1eb9 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
@@ -362,6 +362,15 @@ public class BukkitPermissions {
 			attachments.remove(player);
 		}
 	}
+	
+	/**
+	 * Remove all attachments in case of a restart or reload.
+	 */
+	public void removeAllAttachments() {
+		
+		for (Player player : attachments.keySet())
+			removeAttachment(player);
+	}
 
 	/**
 	 * Player events tracked to cause Superperms updates
-- 
cgit v1.2.3


From e8dd96354592de9cd8b43d6eeca332417e1708f9 Mon Sep 17 00:00:00 2001
From: ElgarL <ElgarL@palmergames.com>
Date: Sat, 7 Apr 2012 17:21:48 +0100
Subject: Fix a concurrent modification error when removing all attachments.

---
 .../org/anjocaido/groupmanager/permissions/BukkitPermissions.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java')

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
index 3b66c1eb9..51f019efc 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
@@ -20,6 +20,7 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -368,8 +369,11 @@ public class BukkitPermissions {
 	 */
 	public void removeAllAttachments() {
 		
-		for (Player player : attachments.keySet())
-			removeAttachment(player);
+		Iterator<Player> itr = attachments.keySet().iterator();
+		
+		while (itr.hasNext()){
+			removeAttachment(itr.next());
+		}
 	}
 
 	/**
-- 
cgit v1.2.3


From f02691863ba41d648c31a7167ed2a6fd3fe57bcd Mon Sep 17 00:00:00 2001
From: ElgarL <ElgarL@palmergames.com>
Date: Tue, 10 Apr 2012 17:02:50 +0100
Subject: Properly fix concurrent modification when removing all attachments.

---
 .../groupmanager/permissions/BukkitPermissions.java         | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java')

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
index 51f019efc..516679544 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
@@ -357,7 +357,7 @@ public class BukkitPermissions {
 			} catch (IllegalArgumentException e) {
 				/*
 				 * Failed to remove attachment
-				 * This usually means Bukkit no longer know of it.
+				 * This usually means Bukkit no longer knows of it.
 				 */
 			}
 			attachments.remove(player);
@@ -372,8 +372,17 @@ public class BukkitPermissions {
 		Iterator<Player> itr = attachments.keySet().iterator();
 		
 		while (itr.hasNext()){
-			removeAttachment(itr.next());
+			Player player = itr.next();
+			try {
+				player.removeAttachment(attachments.get(player));
+			} catch (IllegalArgumentException e) {
+				/*
+				 * Failed to remove attachment
+				 * This usually means Bukkit no longer knows of it.
+				 */
+			}
 		}
+		attachments.clear();
 	}
 
 	/**
-- 
cgit v1.2.3