From 8009c1539a3def75281ac33c2590f7741965b191 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sun, 14 Jul 2013 01:20:36 +0100 Subject: [PATCH] Fix local chat spy tag order. --- Essentials/src/net/ess3/api/events/LocalChatSpyEvent.java | 2 +- .../chat/EssentialsChatPlayerListenerNormal.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Essentials/src/net/ess3/api/events/LocalChatSpyEvent.java b/Essentials/src/net/ess3/api/events/LocalChatSpyEvent.java index d1de2204d..bfa7eeb84 100644 --- a/Essentials/src/net/ess3/api/events/LocalChatSpyEvent.java +++ b/Essentials/src/net/ess3/api/events/LocalChatSpyEvent.java @@ -21,7 +21,7 @@ public class LocalChatSpyEvent extends Event implements Cancellable public LocalChatSpyEvent(final boolean async, final Player who, final String format, final String message, final Set players) { super(async); - this.format = _("chatTypeSpy").concat(format); + this.format = _("chatTypeLocal").concat(_("chatTypeSpy")).concat(format); this.message = message; recipients = players; player = who; diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java index 1143c2588..f61db1a51 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java @@ -97,9 +97,9 @@ public class EssentialsChatPlayerListenerNormal extends EssentialsChatPlayer } return; } - - String type = _("chatTypeLocal"); - event.setFormat(type.concat(event.getFormat())); + + final String format = event.getFormat(); + event.setFormat(_("chatTypeLocal").concat(event.getFormat())); logger.info(_("localFormat", user.getName(), event.getMessage())); @@ -139,7 +139,7 @@ public class EssentialsChatPlayerListenerNormal extends EssentialsChatPlayer user.sendMessage(_("localNoOne")); } - LocalChatSpyEvent spyEvent = new LocalChatSpyEvent(event.isAsynchronous(), event.getPlayer(), event.getFormat(), event.getMessage(), spyList); + LocalChatSpyEvent spyEvent = new LocalChatSpyEvent(event.isAsynchronous(), event.getPlayer(), format, event.getMessage(), spyList); server.getPluginManager().callEvent(spyEvent); if (!spyEvent.isCancelled())