1 files changed, 3 insertions, 22 deletions
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java
index 22989d4f9..276715f31 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java
@@ -10,25 +10,17 @@ import org.bukkit.event.player.PlayerChatEvent;
 
 public class EssentialsChatPlayerListenerHighest extends EssentialsChatPlayer
 {
-	private final transient Map<PlayerChatEvent, String> charges;
-
 	public EssentialsChatPlayerListenerHighest(final Server server,
 											   final IEssentials ess,
 											   final Map<String, IEssentialsChatListener> listeners,
-											   final Map<PlayerChatEvent, String> charges)
+											   final Map<PlayerChatEvent, ChatStore> chatStorage)
 	{
-		super(server, ess, listeners);
-		this.charges = charges;
+		super(server, ess, listeners, chatStorage);
 	}
 
 	@Override
 	public void onPlayerChat(final PlayerChatEvent event)
 	{
-		String charge = charges.remove(event);
-		if (charge == null)
-		{
-			charge = "chat";
-		}
 		if (isAborted(event))
 		{
 			return;
@@ -37,17 +29,6 @@ public class EssentialsChatPlayerListenerHighest extends EssentialsChatPlayer
 		/**
 		 * This file should handle charging the user for the action before returning control back
 		 */
-		final User user = ess.getUser(event.getPlayer());
-
-		try
-		{
-			charge(user, charge);
-		}
-		catch (ChargeException e)
-		{
-			ess.showError(user, e, charge);
-			event.setCancelled(true);
-			return;
-		}
+		charge(event, getChatStore(event));
 	}
 }