Adding join / quit messages in the config test #1697

PlayerChatEvent -> AsyncPlayerChatEvent

3 files changed, 14 insertions, 9 deletions

diff --git a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java
index dca0c3b79..3ecb1f733 100644
--- a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java
+++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java
@@ -7,21 +7,21 @@ import net.ess3.chat.EssentialsChatPlayer;
 import org.bukkit.Server;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.bukkit.event.player.PlayerChatEvent;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
 
 
 public class EssentialsChatPlayerListenerHighest extends EssentialsChatPlayer
 {
 	public EssentialsChatPlayerListenerHighest(final Server server,
 											   final IEssentials ess,
-											   final Map<PlayerChatEvent, ChatStore> chatStorage)
+											   final Map<AsyncPlayerChatEvent, ChatStore> chatStorage)
 	{
 		super(server, ess, chatStorage);
 	}
 
 	@EventHandler(priority = EventPriority.HIGHEST)
 	@Override
-	public void onPlayerChat(final PlayerChatEvent event)
+	public void onPlayerChat(final AsyncPlayerChatEvent event)
 	{
 		final ChatStore chatStore = delChatStore(event);
 		if (event.isCancelled())
diff --git a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java
index f5a8c26ab..836d6af86 100644
--- a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java
+++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java
@@ -8,27 +8,32 @@ import net.ess3.chat.EssentialsChatPlayer;
 import org.bukkit.Server;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.bukkit.event.player.PlayerChatEvent;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
 
 
 public class EssentialsChatPlayerListenerLowest extends EssentialsChatPlayer
 {
 	public EssentialsChatPlayerListenerLowest(final Server server,
 											  final IEssentials ess,
-											  final Map<PlayerChatEvent, ChatStore> chatStorage)
+											  final Map<AsyncPlayerChatEvent, ChatStore> chatStorage)
 	{
 		super(server, ess, chatStorage);
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST)
 	@Override
-	public void onPlayerChat(final PlayerChatEvent event)
+	public void onPlayerChat(final AsyncPlayerChatEvent event)
 	{
 		if (event.isCancelled())
 		{
 			return;
 		}
 		final IUser user = ess.getUserMap().getUser(event.getPlayer());
+		if(user == null)
+		{
+			event.setCancelled(true);
+			return;
+		}
 		final ChatStore chatStore = new ChatStore(ess, user, getChatType(event.getMessage()));
 		setChatStore(event, chatStore);
 		formatChat(event, chatStore);
diff --git a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java
index 201d946c5..bef4322d6 100644
--- a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java
+++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java
@@ -7,21 +7,21 @@ import net.ess3.chat.EssentialsChatPlayer;
 import org.bukkit.Server;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.bukkit.event.player.PlayerChatEvent;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
 
 
 public class EssentialsChatPlayerListenerNormal extends EssentialsChatPlayer
 {
 	public EssentialsChatPlayerListenerNormal(final Server server,
 											  final IEssentials ess,
-											  final Map<PlayerChatEvent, ChatStore> chatStorage)
+											  final Map<AsyncPlayerChatEvent, ChatStore> chatStorage)
 	{
 		super(server, ess, chatStorage);
 	}
 
 	@EventHandler(priority = EventPriority.NORMAL)
 	@Override
-	public void onPlayerChat(final PlayerChatEvent event)
+	public void onPlayerChat(final AsyncPlayerChatEvent event)
 	{
 		if (event.isCancelled())
 		{