diff options
author | snowleo <schneeleo@gmail.com> | 2012-02-06 22:13:39 +0100 |
---|---|---|
committer | snowleo <schneeleo@gmail.com> | 2012-02-06 22:13:39 +0100 |
commit | 539700cb215e088546e5d7f7bba4e1035466626e (patch) | |
tree | 2a9b5d3a0a069a01306a68de40419b843bac8467 /EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java | |
parent | 1078b7b5f28597b28232519621b8d540aaebef4e (diff) | |
download | Essentials-539700cb215e088546e5d7f7bba4e1035466626e.tar Essentials-539700cb215e088546e5d7f7bba4e1035466626e.tar.gz Essentials-539700cb215e088546e5d7f7bba4e1035466626e.tar.lz Essentials-539700cb215e088546e5d7f7bba4e1035466626e.tar.xz Essentials-539700cb215e088546e5d7f7bba4e1035466626e.zip |
New Groups code, supports groups.yml file, gm and vault, new economy api.
Diffstat (limited to 'EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java')
-rw-r--r-- | EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java index cc21b6dae..0315408f7 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java @@ -82,22 +82,14 @@ public abstract class EssentialsChatPlayer implements Listener { event.setMessage(Util.stripColor(event.getMessage())); } - String group = user.getGroup(); + String group = ess.getGroups().getMainGroup(user); String world = user.getWorld().getName(); IGroups groupSettings = ess.getGroups(); - groupSettings.acquireReadLock(); - try - { - event.setFormat(groupSettings.getChatFormat(user).format(new Object[] - { - group, world, world.substring(0, 1).toUpperCase(Locale.ENGLISH) - })); - } - finally - { - groupSettings.unlock(); - } + event.setFormat(groupSettings.getChatFormat(user).format(new Object[] + { + group, world, world.substring(0, 1).toUpperCase(Locale.ENGLISH) + })); } |