diff --git a/pom.xml b/pom.xml
index 16c694d..f210c8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
com.github.austinv11
Discord4j
- 2.6.1
+ websocket-rewrite-SNAPSHOT
diff --git a/src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java b/src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java
index ab45771..65bfd10 100644
--- a/src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java
+++ b/src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java
@@ -27,6 +27,14 @@ public abstract class DiscordSenderBase implements IDiscordSender {
private volatile String msgtosend = "";
private volatile BukkitTask sendtask;
+ public IUser getUser() {
+ return user;
+ }
+
+ public IChannel getChannel() {
+ return channel;
+ }
+
@Override
public void sendMessage(String message) {
try {
@@ -42,7 +50,8 @@ public abstract class DiscordSenderBase implements IDiscordSender {
msgtosend += "\n" + sendmsg;
if (sendtask == null)
sendtask = Bukkit.getScheduler().runTaskLaterAsynchronously(DiscordPlugin.plugin, () -> {
- DiscordPlugin.sendMessageToChannel(channel, (!broadcast ? user.mention() + "\n" : "") + msgtosend.trim());
+ DiscordPlugin.sendMessageToChannel(channel,
+ (!broadcast ? user.mention() + "\n" : "") + msgtosend.trim());
sendtask = null;
msgtosend = "";
}, 10); // Waits a half second to gather all/most of the different messages
diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
index d68a42d..2bb2251 100644
--- a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
+++ b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
@@ -80,7 +80,8 @@ public class MCChatListener implements Listener, IListener
// Command not whitelisted
DiscordPlugin.sendMessageToChannel(event.getMessage().getChannel(), // TODO
"Sorry, you need to be online on the server and have your accounts connected, you can only access these commands:\n"
- + Arrays.toString(UnconnectedCmds)
+ + Arrays.stream(UnconnectedCmds).map(uc -> "/" + uc)
+ .collect(Collectors.joining(", "))
+ "\nTo connect your accounts, use @ChromaBot connect in "
+ DiscordPlugin.botchannel.mention());
return;
@@ -88,11 +89,11 @@ public class MCChatListener implements Listener, IListener
Bukkit.dispatchCommand(dsender, cmd);
} else
TBMCChatAPI.SendChatMessage(Channel.GlobalChat, dsender,
- dmessage + (event.getMessage().getAttachments().size() > 0 ? event.getMessage().getAttachments()
- .stream().map(a -> a.getUrl()).collect(Collectors.joining("\n")) : ""));
- } catch (
-
- Exception e) {
+ dmessage + (event.getMessage().getAttachments().size() > 0 ? "\n" + event.getMessage()
+ .getAttachments().stream().map(a -> a.getUrl()).collect(Collectors.joining("\n"))
+ : ""));
+ event.getMessage().addReaction(DiscordPlugin.mainServer.getEmojiByName("white_check_mark"));
+ } catch (Exception e) {
TBMCCoreAPI.SendException("An error occured while handling " + dmessage + "!", e);
return;
}