Skip to content

Commit 191b02a

Browse files
committed
Fixes
1 parent b0d7a6a commit 191b02a

File tree

3 files changed

+14
-18
lines changed

3 files changed

+14
-18
lines changed

src/main/java/io/github/thedoctorone/CommandReload.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ public class CommandReload implements CommandExecutor {
1414
private Main main;
1515
private String fast = "fast";
1616
private String full = "full";
17-
private String helpMessage = "\n*****************************************************************\n" +
17+
private String helpMessage = "\n**************************************************************\n" +
1818
"Minecraft Connects Discord by Mahmut H. Kocas\n" +
1919
"/discord : Commands\n" +
2020
"/discord fast : Changes everything according to config file except Discord Bot Token\n" +
2121
"/discord full : Changes everything according to config file\n" +
22-
"*****************************************************************";
22+
"**************************************************************";
2323

2424
CommandReload (Main main, DiscordCommunication dc) {
2525
this.dc = dc;

src/main/java/io/github/thedoctorone/DiscordCommunication.java

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@
88
import net.dv8tion.jda.api.OnlineStatus;
99
import net.dv8tion.jda.api.entities.Activity;
1010
import net.dv8tion.jda.api.entities.Activity.ActivityType;
11+
import net.dv8tion.jda.api.events.ReadyEvent;
12+
import net.dv8tion.jda.api.events.ReconnectedEvent;
13+
import net.dv8tion.jda.api.events.StatusChangeEvent;
1114
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
1215
import net.dv8tion.jda.api.hooks.ListenerAdapter;
1316
import org.bukkit.Server;
1417

1518
import java.util.logging.Logger;
1619

17-
public class DiscordCommunication extends ListenerAdapter implements Runnable {
20+
public class DiscordCommunication extends ListenerAdapter {
1821
static JDA MCD;
1922
private String channelId;
2023
private Logger lg;
@@ -52,25 +55,19 @@ public void onMessageReceived(MessageReceivedEvent event) {
5255
if(event.getChannel().getId().equals(channelId) && !event.getAuthor().isBot())
5356
server.broadcastMessage("[Discord] " + event.getAuthor().getName() + " : " + event.getMessage().getContentRaw());
5457
}
58+
private boolean first = true;
59+
@Override
60+
public void onReady(ReadyEvent event) {
61+
if(first) {
62+
MCD.getTextChannelById(channelId).sendMessage(serverStartMessage).queue();
63+
first = false;
64+
}
65+
}
5566

5667
public void sendMessageToDiscord(String message) {
5768
MCD.getTextChannelById(channelId).sendMessage(message).queue();
5869
}
5970

60-
@Override
61-
public void run() {
62-
while (true) {
63-
try {
64-
MCD.getTextChannelById(channelId).sendMessage(serverStartMessage).queue();
65-
//IF YOU REALLY MODIFIED THE PROJECT YOU CAN DELETE THIS MESSAGE. OTHERWISE, YOU ARE NOT ALLOWED TO!
66-
//MCD.getTextChannelById(channelId).sendMessage("```css\n'Minecraft Connects Discord'\n Made by Mahmut H. Kocas \n https://www.thedoctorone.github.io```").queue();
67-
break;
68-
} catch (NullPointerException | IllegalMonitorStateException e) {
69-
continue;
70-
}
71-
}
72-
}
73-
7471
public void setChannelId(String channelId) {
7572
this.channelId = channelId;
7673
}

src/main/java/io/github/thedoctorone/Main.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public void onEnable() {
4141
try {
4242
dc.executeBot(getServer(), getLogger(), TOKEN, channelID, ServerStart);
4343
getServer().getPluginManager().registerEvents(this, this);
44-
new Thread(dc).run();
4544
} catch (LoginException e) {
4645
getLogger().warning("Couldn't join to discord! Check your token or Internet Connection!");
4746
}

0 commit comments

Comments
 (0)