Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-02 22:47:41 +01:00
Code Issues Projects Releases Wiki Activity

Fix issues with chat preview refactor (#5062)

Browse Source 
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
This commit is contained in:
MD 2022-08-14 23:49:02 +01:00 committed by GitHub
parent 1c22edbb1b
commit 2f4f555923
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java
View File

@ -260,6 +260,11 @@ public abstract class AbstractChatHandler {
return event.isCancelled(); return event.isCancelled();
} }
boolean isPlayerChat(final AsyncPlayerChatEvent event) {
// Used to distinguish chats from Player#chat (sync) from chats sent by the player (async)
return event.isAsynchronous();
}
String getChatType(final User user, final String message) { String getChatType(final User user, final String message) {
if (message.length() == 0) { if (message.length() == 0) {
//Ignore empty chat events generated by plugins //Ignore empty chat events generated by plugins

3
EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatProcessingCache.java
View File

@ -54,7 +54,7 @@ public class ChatProcessingCache {
return getProcessedChat(player); return getProcessedChat(player);
} }
public static abstract class Chat { public abstract static class Chat {
private final User user; private final User user;
private final String type; private final String type;
private final String originalMessage; private final String originalMessage;
@ -96,6 +96,7 @@ public class ChatProcessingCache {
super(sourceChat.getUser(), sourceChat.getType(), sourceChat.getOriginalMessage()); super(sourceChat.getUser(), sourceChat.getType(), sourceChat.getOriginalMessage());
this.message = sourceChat.messageResult; this.message = sourceChat.messageResult;
this.format = sourceChat.formatResult; this.format = sourceChat.formatResult;
this.radius = sourceChat.radius;
this.charge = new Trade(getLongType(), ess); this.charge = new Trade(getLongType(), ess);
} }

2
EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/SignedChatHandler.java
View File

@ -44,7 +44,7 @@ public class SignedChatHandler extends AbstractChatHandler {
private void handleChatApplyPreview(AsyncPlayerChatEvent event) { private void handleChatApplyPreview(AsyncPlayerChatEvent event) {
final ChatProcessingCache.ProcessedChat chat = cache.getProcessedChat(event.getPlayer()); final ChatProcessingCache.ProcessedChat chat = cache.getProcessedChat(event.getPlayer());
if (chat == null) { if (!isPlayerChat(event) || chat == null) {
handleChatFormat(event); handleChatFormat(event);
handleChatPostFormat(event); handleChatPostFormat(event);
} else { } else {