Upstream
/
Essentials
mirror of https://github.com/EssentialsX/Essentials.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix local chat spy tag order.

This commit is contained in:
KHobbits 2013-07-14 01:20:36 +01:00
parent 29ea24f715
commit 8009c1539a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/net/ess3/api/events/LocalChatSpyEvent.java
View File

@ -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<Player> players)
{
super(async);
this.format = _("chatTypeSpy").concat(format);
this.format = _("chatTypeLocal").concat(_("chatTypeSpy")).concat(format);
this.message = message;
recipients = players;
player = who;

8
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
View File

@ -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())