2nd sweep over Essentials Chat, to implement 2.8 changes.

Formatting cache still needs reimplemented.

1 files changed, 15 insertions, 14 deletions

diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java
index 14b22f548..7d343160e 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java
@@ -3,33 +3,34 @@ package com.earth2me.essentials.chat;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IUser;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
- 
-public class EssentialsLocalChatEventListener implements Listener {
 
-	
+
+public class EssentialsLocalChatEventListener implements Listener
+{
 	protected transient IEssentials ess;
 	protected final transient Server server;
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 
 	public EssentialsLocalChatEventListener(final Server server, final IEssentials ess)
 	{
 		this.ess = ess;
 		this.server = server;
 	}
-	
-	@EventHandler
-    public void onLocalChat(final EssentialsLocalChatEvent event) {		
+
+	@EventHandler(priority = EventPriority.HIGHEST)
+	public void onLocalChat(final EssentialsLocalChatEvent event)
+	{
+
 		final Player sender = event.getPlayer();
-		if (event.getRadius() < 1)
-		{
-			return;
-		}
-		event.setCancelled(true);
 		final Location loc = sender.getLocation();
 		final World world = loc.getWorld();
 
@@ -64,8 +65,8 @@ public class EssentialsLocalChatEventListener implements Listener {
 				}
 			}
 
-			final String message = String.format(event.getFormat(), type.concat(sender.getDisplayName()), event.getMessage());
+			final String message = type.concat(String.format(event.getFormat(), sender.getDisplayName(), event.getMessage()));
 			user.sendMessage(message);
-		}	
-    } 
+		}
+	}
 }
\ No newline at end of file