Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-14 06:36:40 +01:00
Code Issues Projects Releases Wiki Activity

Use sendTl to ensure message format is parsed

Browse Source
This commit is contained in:
MD 2024-02-04 00:14:50 +00:00
parent 388d571da9
commit 7c1e807a2d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Essentials/src/main/java/com/earth2me/essentials/messaging/SimpleMessageRecipient.java
View File

@ -95,10 +95,10 @@ public class SimpleMessageRecipient implements IMessageRecipient {
final MessageResponse messageResponse = recipient.onReceiveMessage(this.parent, message);
switch (messageResponse) {
case UNREACHABLE:
sendMessage(tlSender("recentlyForeverAlone", CommonPlaceholders.displayNameRecipient(recipient)));
sendTl("recentlyForeverAlone", CommonPlaceholders.displayNameRecipient(recipient));
break;
case MESSAGES_IGNORED:
sendMessage(tlSender("msgIgnore", CommonPlaceholders.displayNameRecipient(recipient)));
sendTl("msgIgnore", CommonPlaceholders.displayNameRecipient(recipient));
break;
case SENDER_IGNORED:
break;
@ -106,13 +106,13 @@ public class SimpleMessageRecipient implements IMessageRecipient {
case SUCCESS_BUT_AFK:
// Currently, only IUser can be afk, so we unsafely cast to get the afk message.
if (((IUser) recipient).getAfkMessage() != null) {
sendMessage(tlSender("userAFKWithMessage", CommonPlaceholders.displayNameRecipient(recipient), ((IUser) recipient).getAfkMessage()));
sendTl("userAFKWithMessage", CommonPlaceholders.displayNameRecipient(recipient), ((IUser) recipient).getAfkMessage());
} else {
sendMessage(tlSender("userAFK", CommonPlaceholders.displayNameRecipient(recipient)));
sendTl("userAFK", CommonPlaceholders.displayNameRecipient(recipient));
}
// fall through
default:
sendMessage(tlLiteral("msgFormat", AdventureUtil.parsed(tlSender("meSender")), CommonPlaceholders.displayNameRecipient(recipient), message));
sendTl("msgFormat", AdventureUtil.parsed(tlSender("meSender")), CommonPlaceholders.displayNameRecipient(recipient), message);
// Better Social Spy
if (ess.getSettings().isSocialSpyMessages()) {
@ -170,7 +170,7 @@ public class SimpleMessageRecipient implements IMessageRecipient {
}
}
// Display the formatted message to this recipient.
sendMessage(tlLiteral("msgFormat", CommonPlaceholders.displayNameRecipient(sender), tlSender("meRecipient"), message));
sendTl("msgFormat", CommonPlaceholders.displayNameRecipient(sender), tlSender("meRecipient"), message);
if (isLastMessageReplyRecipient) {
// If this recipient doesn't have a reply recipient, initiate by setting the first