Merge of server-layer branch

3 files changed, 102 insertions, 0 deletions

diff --git a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java
new file mode 100644
index 000000000..46dc2af82
--- /dev/null
+++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java
@@ -0,0 +1,33 @@
+package net.ess3.chat.listenerlevel;
+
+import net.ess3.api.IEssentials;
+import net.ess3.chat.ChatStore;
+import net.ess3.chat.EssentialsChatPlayer;
+import java.util.Map;
+import org.bukkit.Server;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerChatEvent;
+
+
+public class EssentialsChatPlayerListenerHighest extends EssentialsChatPlayer
+{
+	public EssentialsChatPlayerListenerHighest(final Server server,
+											   final IEssentials ess,
+											   final Map<PlayerChatEvent, ChatStore> chatStorage)
+	{
+		super(server, ess, chatStorage);
+	}
+
+	@EventHandler(priority = EventPriority.HIGHEST)
+	@Override
+	public void onPlayerChat(final PlayerChatEvent event)
+	{
+		final ChatStore chatStore = delChatStore(event);
+		if (event.isCancelled())
+		{
+			return;
+		}
+		chargeChat(event, chatStore);
+	}
+}
diff --git a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java
new file mode 100644
index 000000000..dfe96df35
--- /dev/null
+++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java
@@ -0,0 +1,36 @@
+package net.ess3.chat.listenerlevel;
+
+import net.ess3.api.IEssentials;
+import net.ess3.api.IUser;
+import net.ess3.chat.ChatStore;
+import net.ess3.chat.EssentialsChatPlayer;
+import java.util.Map;
+import org.bukkit.Server;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerChatEvent;
+
+
+public class EssentialsChatPlayerListenerLowest extends EssentialsChatPlayer
+{
+	public EssentialsChatPlayerListenerLowest(final Server server,
+											  final IEssentials ess,
+											  final Map<PlayerChatEvent, ChatStore> chatStorage)
+	{
+		super(server, ess, chatStorage);
+	}
+
+	@EventHandler(priority = EventPriority.LOWEST)
+	@Override
+	public void onPlayerChat(final PlayerChatEvent event)
+	{
+		if (event.isCancelled())
+		{
+			return;
+		}
+		final IUser user = ess.getUser(event.getPlayer());
+		final ChatStore chatStore = new ChatStore(ess, user, getChatType(event.getMessage()));
+		setChatStore(event, chatStore);
+		formatChat(event, chatStore);
+	}
+}
\ No newline at end of file
diff --git a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java
new file mode 100644
index 000000000..2e3b44549
--- /dev/null
+++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java
@@ -0,0 +1,33 @@
+package net.ess3.chat.listenerlevel;
+
+import net.ess3.api.IEssentials;
+import net.ess3.chat.ChatStore;
+import net.ess3.chat.EssentialsChatPlayer;
+import java.util.Map;
+import org.bukkit.Server;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerChatEvent;
+
+
+public class EssentialsChatPlayerListenerNormal extends EssentialsChatPlayer
+{
+	public EssentialsChatPlayerListenerNormal(final Server server,
+											  final IEssentials ess,
+											  final Map<PlayerChatEvent, ChatStore> chatStorage)
+	{
+		super(server, ess, chatStorage);
+	}
+
+	@EventHandler(priority = EventPriority.NORMAL)
+	@Override
+	public void onPlayerChat(final PlayerChatEvent event)
+	{
+		if (event.isCancelled())
+		{
+			return;
+		}
+		final ChatStore chatStore = getChatStore(event);
+		handleLocalChat(event, chatStore);
+	}
+}