diff options
Diffstat (limited to 'common/src/main/java/de')
-rw-r--r-- | common/src/main/java/de/hype/bbsentials/common/chat/Chat.java | 7 | ||||
-rw-r--r-- | common/src/main/java/de/hype/bbsentials/common/chat/Message.java | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/common/src/main/java/de/hype/bbsentials/common/chat/Chat.java b/common/src/main/java/de/hype/bbsentials/common/chat/Chat.java index 669dd5d..487abe2 100644 --- a/common/src/main/java/de/hype/bbsentials/common/chat/Chat.java +++ b/common/src/main/java/de/hype/bbsentials/common/chat/Chat.java @@ -116,13 +116,12 @@ public class Chat { } public Message onEvent(Message text) { - if (!isSpam(text.toString())) { + if (!isSpam(text.getString())) { if (BBsentials.getConfig().isDetailedDevModeEnabled()) { System.out.println("got a message: " + text.getJson()); } - Message message = new Message(text.toString(),text.getString()); - BBsentials.executionService.execute(() -> processThreaded(message)); - return processNotThreaded(message); + BBsentials.executionService.execute(() -> processThreaded(text)); + return processNotThreaded(text); } return text; // Return the original message if it is spam } diff --git a/common/src/main/java/de/hype/bbsentials/common/chat/Message.java b/common/src/main/java/de/hype/bbsentials/common/chat/Message.java index 66a3599..7d4b62d 100644 --- a/common/src/main/java/de/hype/bbsentials/common/chat/Message.java +++ b/common/src/main/java/de/hype/bbsentials/common/chat/Message.java @@ -7,12 +7,19 @@ public class Message { private String unformattedString = null; private String playerName = null; private String string; + public boolean actionBar = false; public Message(String textJson,String string) { this.text = textJson; if (string==null) string = ""; this.string=string; } + public Message(String textJson,String string,boolean actionbar) { + this.text = textJson; + if (string==null) string = ""; + this.string=string; + this.actionBar = actionbar; + } public static Message of(String string){ return new Message("{\"text\":\""+string+"\"}",string); } |