summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java
diff options
context:
space:
mode:
authorElgarL <ElgarL@palmergames.com>2013-01-09 14:38:00 +0000
committerElgarL <ElgarL@palmergames.com>2013-01-09 14:38:00 +0000
commit767057512abbba410631ea2a29068b6fc79c92d0 (patch)
tree5f55ed2cdf98c3896ca766b6e87d9e59de291b2d /EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java
parent11022e868341b33292b74902935f33bf7ccaf833 (diff)
downloadEssentials-767057512abbba410631ea2a29068b6fc79c92d0.tar
Essentials-767057512abbba410631ea2a29068b6fc79c92d0.tar.gz
Essentials-767057512abbba410631ea2a29068b6fc79c92d0.tar.lz
Essentials-767057512abbba410631ea2a29068b6fc79c92d0.tar.xz
Essentials-767057512abbba410631ea2a29068b6fc79c92d0.zip
Synchronize the raising of GroupManager events to Bukkit.getServer()
(should prevent deadlocks).
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java')
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java
index cf63dd8d7..ea0e5bc7c 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java
@@ -16,7 +16,6 @@ import java.util.logging.Level;
import org.anjocaido.groupmanager.data.Group;
import org.anjocaido.groupmanager.events.GMGroupEvent;
-import org.anjocaido.groupmanager.events.GroupManagerEventHandler;
import org.anjocaido.groupmanager.utils.PermissionCheckResult;
import org.anjocaido.groupmanager.utils.Tasks;
import org.yaml.snakeyaml.DumperOptions;
@@ -308,7 +307,7 @@ public class GlobalGroups {
newGroup(groupToAdd);
haveGroupsChanged = true;
if (GroupManager.isLoaded())
- GroupManagerEventHandler.callEvent(groupToAdd, GMGroupEvent.Action.GROUP_ADDED);
+ GroupManager.getGMEventHandler().callEvent(groupToAdd, GMGroupEvent.Action.GROUP_ADDED);
}
/**
@@ -339,7 +338,7 @@ public class GlobalGroups {
groups.remove(groupName.toLowerCase());
this.setGroupsChanged(true);
if (GroupManager.isLoaded())
- GroupManagerEventHandler.callEvent(groupName.toLowerCase(), GMGroupEvent.Action.GROUP_REMOVED);
+ GroupManager.getGMEventHandler().callEvent(groupName.toLowerCase(), GMGroupEvent.Action.GROUP_REMOVED);
return true;
}
return false;