From 556c990eff34a4848fe92afa43f27cd81505f05a Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sat, 17 Dec 2011 17:40:47 +0000 Subject: EssentialsChat cleaning. --- .../EssentialsChatPlayerListenerNormal.java | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java (limited to 'EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java') diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java b/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java new file mode 100644 index 000000000..c1a9968ef --- /dev/null +++ b/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java @@ -0,0 +1,32 @@ +package com.earth2me.essentials.chat.listenerlevel; + +import com.earth2me.essentials.api.IEssentials; +import com.earth2me.essentials.chat.EssentialsChatPlayer; +import java.util.Map; +import org.bukkit.Server; +import org.bukkit.event.player.PlayerChatEvent; + + +public class EssentialsChatPlayerListenerNormal extends EssentialsChatPlayer +{ + private final transient Map charges; + + public EssentialsChatPlayerListenerNormal(final Server server, + final IEssentials ess, + final Map charges) + { + super(server, ess); + this.charges = charges; + } + + @Override + public void onPlayerChat(final PlayerChatEvent event) + { + if (isAborted(event)) + { + return; + } + + handleLocalChat(charges, event); + } +} -- cgit v1.2.3 From bdc695c85b97a31694c75716f33566b171a9559f Mon Sep 17 00:00:00 2001 From: KHobbits Date: Tue, 24 Jan 2012 22:08:20 +0000 Subject: First sweep over Essentials Chat, to implement 2.8 changes. Formatting cache still needs reimplemented. --- .../EssentialsChatPlayerListenerNormal.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java') diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java b/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java index c1a9968ef..c456b700d 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java @@ -1,32 +1,33 @@ package com.earth2me.essentials.chat.listenerlevel; import com.earth2me.essentials.api.IEssentials; +import com.earth2me.essentials.chat.ChatStore; import com.earth2me.essentials.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 { - private final transient Map charges; - public EssentialsChatPlayerListenerNormal(final Server server, final IEssentials ess, - final Map charges) + final Map chatStorage) { - super(server, ess); - this.charges = charges; + super(server, ess, chatStorage); } + @EventHandler(priority = EventPriority.NORMAL) @Override public void onPlayerChat(final PlayerChatEvent event) { - if (isAborted(event)) + if (event.isCancelled()) { return; } - - handleLocalChat(charges, event); + final ChatStore chatStore = getChatStore(event); + handleLocalChat(event, chatStore); } } -- cgit v1.2.3