diff options
author | ElgarL <ElgarL@palmergames.com> | 2013-01-09 14:38:00 +0000 |
---|---|---|
committer | ElgarL <ElgarL@palmergames.com> | 2013-01-09 14:38:00 +0000 |
commit | f25693026905df423b8e92f9cb252a292c50fcab (patch) | |
tree | cf0095a6a1a36a11a9694285020e555afe414728 /EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java | |
parent | cde95d832e0a1bbb51b3d0228def2356456a8c25 (diff) | |
download | Essentials-f25693026905df423b8e92f9cb252a292c50fcab.tar Essentials-f25693026905df423b8e92f9cb252a292c50fcab.tar.gz Essentials-f25693026905df423b8e92f9cb252a292c50fcab.tar.lz Essentials-f25693026905df423b8e92f9cb252a292c50fcab.tar.xz Essentials-f25693026905df423b8e92f9cb252a292c50fcab.zip |
Synchronize the raising of GroupManager events to Bukkit.getServer()
(should prevent deadlocks).
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java')
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java | 10 |
1 files changed, 4 insertions, 6 deletions
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); } } |