New Groups code, supports groups.yml file, gm and vault, new economy api.

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)
+				}));
 
 	}