From f25693026905df423b8e92f9cb252a292c50fcab Mon Sep 17 00:00:00 2001
From: ElgarL <ElgarL@palmergames.com>
Date: Wed, 9 Jan 2013 14:38:00 +0000
Subject: Synchronize the raising of GroupManager events to Bukkit.getServer()
 (should prevent deadlocks).

---
 .../events/GroupManagerEventHandler.java           | 40 +++++++++++++++++-----
 1 file changed, 32 insertions(+), 8 deletions(-)

(limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEventHandler.java')

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEventHandler.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEventHandler.java
index 5fc555cc4..dd24dffdb 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEventHandler.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEventHandler.java
@@ -2,6 +2,7 @@ package org.anjocaido.groupmanager.events;
 
 import org.anjocaido.groupmanager.data.Group;
 import org.anjocaido.groupmanager.data.User;
+import org.bukkit.Server;
 
 /**
  * @author ElgarL
@@ -10,44 +11,67 @@ import org.anjocaido.groupmanager.data.User;
  * 
  */
 public class GroupManagerEventHandler {
+	
+	protected Server server;
+	
+	public GroupManagerEventHandler(Server server) {
+		this.server = server;
+	}
 
-	protected static void callEvent(GMGroupEvent event) {
+	protected void callEvent(GMGroupEvent event) {
 
 		event.schedule(event);
 	}
 
-	protected static void callEvent(GMUserEvent event) {
+	protected void callEvent(GMUserEvent event) {
 
 		event.schedule(event);
 	}
 
-	protected static void callEvent(GMSystemEvent event) {
+	protected void callEvent(GMSystemEvent event) {
 
 		event.schedule(event);
 	}
 
-	public static void callEvent(Group group, GMGroupEvent.Action action) {
+	public void callEvent(Group group, GMGroupEvent.Action action) {
 
 		callEvent(new GMGroupEvent(group, action));
 	}
 
-	public static void callEvent(String groupName, GMGroupEvent.Action action) {
+	public void callEvent(String groupName, GMGroupEvent.Action action) {
 
 		callEvent(new GMGroupEvent(groupName, action));
 	}
 
-	public static void callEvent(User user, GMUserEvent.Action action) {
+	public void callEvent(User user, GMUserEvent.Action action) {
 
 		callEvent(new GMUserEvent(user, action));
 	}
 
-	public static void callEvent(String userName, GMUserEvent.Action action) {
+	public void callEvent(String userName, GMUserEvent.Action action) {
 
 		callEvent(new GMUserEvent(userName, action));
 	}
 
-	public static void callEvent(GMSystemEvent.Action action) {
+	public void callEvent(GMSystemEvent.Action action) {
 
 		callEvent(new GMSystemEvent(action));
 	}
+	
+	/**
+	 * @return the server
+	 */
+	public Server getServer() {
+	
+		return server;
+	}
+
+	
+	/**
+	 * @param server the server to set
+	 */
+	public void setServer(Server server) {
+	
+		this.server = server;
+	}
 }
\ No newline at end of file
-- 
cgit v1.2.3