Synchronize the raising of GroupManager events to Bukkit.getServer()

(should prevent deadlocks).

2 files changed, 7 insertions, 11 deletions

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java
index 8da6ba85a..c0c19c997 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java
@@ -7,8 +7,6 @@ package org.anjocaido.groupmanager.data;
 import org.anjocaido.groupmanager.GroupManager;
 import org.anjocaido.groupmanager.dataholder.WorldDataHolder;
 import org.anjocaido.groupmanager.events.GMGroupEvent.Action;
-import org.anjocaido.groupmanager.events.GroupManagerEventHandler;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -144,7 +142,7 @@ public class Group extends DataUnit implements Cloneable {
 			flagAsChanged();
 			if (GroupManager.isLoaded()) {
 				GroupManager.BukkitPermissions.updateAllPlayers();
-				GroupManagerEventHandler.callEvent(this, Action.GROUP_INHERITANCE_CHANGED);
+				GroupManager.getGMEventHandler().callEvent(this, Action.GROUP_INHERITANCE_CHANGED);
 			}
 		}
 	}
@@ -157,7 +155,7 @@ public class Group extends DataUnit implements Cloneable {
 				clone.remove(inherit.toLowerCase());
 				inherits = Collections.unmodifiableList(clone);
 				flagAsChanged();
-				GroupManagerEventHandler.callEvent(this, Action.GROUP_INHERITANCE_CHANGED);
+				GroupManager.getGMEventHandler().callEvent(this, Action.GROUP_INHERITANCE_CHANGED);
 				return true;
 			}
 		}
@@ -187,7 +185,7 @@ public class Group extends DataUnit implements Cloneable {
 			flagAsChanged();
 			if (GroupManager.isLoaded()) {
 				GroupManager.BukkitPermissions.updateAllPlayers();
-				GroupManagerEventHandler.callEvent(this, Action.GROUP_INFO_CHANGED);
+				GroupManager.getGMEventHandler().callEvent(this, Action.GROUP_INFO_CHANGED);
 			}
 		}
 	}
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java
index a829bfa14..bbb2ae03a 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java
@@ -12,8 +12,6 @@ import java.util.List;
 import org.anjocaido.groupmanager.GroupManager;
 import org.anjocaido.groupmanager.dataholder.WorldDataHolder;
 import org.anjocaido.groupmanager.events.GMUserEvent.Action;
-import org.anjocaido.groupmanager.events.GroupManagerEventHandler;
-
 import java.util.Map;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -148,7 +146,7 @@ public class User extends DataUnit implements Cloneable {
 			if (notify)
 				GroupManager.notify(this.getName(), String.format(" moved to the group %s.", group.getName()));
 
-			GroupManagerEventHandler.callEvent(this, Action.USER_GROUP_CHANGED);
+			GroupManager.getGMEventHandler().callEvent(this, Action.USER_GROUP_CHANGED);
 		}
 	}
 
@@ -172,7 +170,7 @@ public class User extends DataUnit implements Cloneable {
 		if (GroupManager.isLoaded()) {
 			if (!GroupManager.BukkitPermissions.isPlayer_join())
 				GroupManager.BukkitPermissions.updatePlayer(getBukkitPlayer());
-			GroupManagerEventHandler.callEvent(this, Action.USER_SUBGROUP_CHANGED);
+			GroupManager.getGMEventHandler().callEvent(this, Action.USER_SUBGROUP_CHANGED);
 		}
 		return true;
 
@@ -204,7 +202,7 @@ public class User extends DataUnit implements Cloneable {
 				if (GroupManager.isLoaded())
 					if (!GroupManager.BukkitPermissions.isPlayer_join())
 						GroupManager.BukkitPermissions.updatePlayer(getBukkitPlayer());
-				GroupManagerEventHandler.callEvent(this, Action.USER_SUBGROUP_CHANGED);
+				GroupManager.getGMEventHandler().callEvent(this, Action.USER_SUBGROUP_CHANGED);
 				return true;
 			}
 		} catch (Exception e) {
@@ -257,7 +255,7 @@ public class User extends DataUnit implements Cloneable {
 		if (GroupManager.isLoaded()) {
 			//if (!GroupManager.BukkitPermissions.isPlayer_join())
 			//	GroupManager.BukkitPermissions.updatePlayer(this.getName());
-			GroupManagerEventHandler.callEvent(this, Action.USER_INFO_CHANGED);
+			GroupManager.getGMEventHandler().callEvent(this, Action.USER_INFO_CHANGED);
 		}
 	}