Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Fix CouncilChannel, unloading issues

Browse Source
This commit is contained in:
Lixfel
2025-01-21 00:03:39 +01:00
parent 3fadeb7751
commit 7f7f84a4c4
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java
+11 -1
View File
@@ -252,7 +252,17 @@ public class VelocityCore implements ReloadablePlugin {
@Override
public void onProxyShutdown(ProxyShutdownEvent event) {
try {
DiscordBot.withBot(bot -> bot.getJda().shutdownNow());
DiscordBot.withBot(bot -> {
bot.getJda().shutdownNow();
bot.getJda().getHttpClient().connectionPool().evictAll();
bot.getJda().getHttpClient().dispatcher().executorService().shutdown();
try {
if(!bot.getJda().awaitShutdown(1, TimeUnit.SECONDS))
logger.log(Level.SEVERE, "Could not await discord bot shutdown");
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
});
} catch (Throwable e) {
logger.log(Level.SEVERE, "Could not shutdown discord bot", e);
}
VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java
+1 -1
View File
@@ -97,7 +97,7 @@ public class DiscordBot {
.createDefault(config.getToken())
.setStatus(OnlineStatus.ONLINE)
.setMemberCachePolicy(MemberCachePolicy.ONLINE)
.enableIntents(GatewayIntent.MESSAGE_CONTENT)
.enableIntents(GatewayIntent.GUILD_MEMBERS, GatewayIntent.MESSAGE_CONTENT)
.build();
instance = this;
VelocityCore/src/de/steamwar/velocitycore/discord/channels/CouncilChannel.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class CouncilChannel extends StaticMessageChannel {
MessageCreateBuilder messageCreateBuilder = new MessageCreateBuilder();
messageCreateBuilder.setContent("# Ratsmitglieder");
for (Member member : DiscordBot.getGuild().getMembersWithRoles(role)) {
for (Member member : DiscordBot.getGuild().findMembersWithRoles(role).get()) {
SteamwarUser steamwarUser = SteamwarUser.get(member.getIdLong());
if (steamwarUser == null)
continue;