From 539700cb215e088546e5d7f7bba4e1035466626e Mon Sep 17 00:00:00 2001 From: snowleo Date: Mon, 6 Feb 2012 22:13:39 +0100 Subject: New Groups code, supports groups.yml file, gm and vault, new economy api. --- .../earth2me/essentials/chat/EssentialsChatPlayer.java | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'EssentialsChat/src/com/earth2me/essentials') 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) + })); } -- cgit v1.2.3