diff --git a/.idea/misc.xml b/.idea/misc.xml index d9285ab0..e9d35ed1 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..0c1f4d96 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/Bot.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/Bot.java index ec46191c..34a9c0b8 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/Bot.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/Bot.java @@ -84,6 +84,12 @@ public class Bot { this.bruhify = new BruhifyPlugin(this); this.grepLog = new GrepLogPlugin(this); + try { + Thread.sleep(1000); // real + } catch (InterruptedException ignored) { + System.exit(1); + } + reconnect(); } @@ -99,10 +105,13 @@ public class Bot { @Override public void packetReceived(Session session, Packet packet) { - for (SessionListener listener : listeners) { - if (packet instanceof ClientboundLoginPacket) { + if (packet instanceof ClientboundLoginPacket) { + for (SessionListener listener : listeners) { listener.connected(new ConnectedEvent(session)); } + } + + for (SessionListener listener : listeners) { listener.packetReceived(session, packet); } } diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/DiscordPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/DiscordPlugin.java index 6dd5cea5..835123de 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/DiscordPlugin.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/DiscordPlugin.java @@ -69,8 +69,6 @@ public class DiscordPlugin { for (Bot bot : Main.allBots) { String channelId = servers.get(bot.host() + ":" + bot.port()); - bot.discord(this); - bot.addListener(new SessionAdapter() { @Override public void connected(ConnectedEvent event) { @@ -80,8 +78,6 @@ public class DiscordPlugin { if (channelAlreadyAddedListeners) return; - alreadyAddedListeners.put(channelId, true); - jda.addEventListener(new ListenerAdapter() { @Override public void onMessageReceived(@NotNull MessageReceivedEvent event) { @@ -176,6 +172,8 @@ public class DiscordPlugin { } }); + alreadyAddedListeners.put(channelId, true); + bot.executor().scheduleAtFixedRate(() -> onDiscordTick(channelId), 0, 50, TimeUnit.MILLISECONDS); } @@ -184,6 +182,8 @@ public class DiscordPlugin { sendMessageInstantly("Disconnected: " + "`" + event.getReason().replace("`", "\\`") + "`", channelId); } }); + + bot.discord(this); } }