Skip to content

Commit

Permalink
Merge branch 'refs/heads/develop' into version/1.20.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Erdragh committed May 31, 2024
2 parents 0a2ce2e + 7fe65d0 commit e2a3d28
Showing 1 changed file with 5 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
package dev.erdragh.astralbot.commands.discord

import dev.erdragh.astralbot.LOGGER
import dev.erdragh.astralbot.*
import dev.erdragh.astralbot.config.AstralBotConfig
import dev.erdragh.astralbot.config.AstralBotTextConfig
import dev.erdragh.astralbot.guild
import dev.erdragh.astralbot.handlers.WhitelistHandler
import dev.erdragh.astralbot.textChannel
import dev.erdragh.astralbot.waitForSetup
import kotlinx.coroutines.runBlocking
import net.dv8tion.jda.api.Permission
import net.dv8tion.jda.api.entities.Role
Expand Down Expand Up @@ -34,6 +31,7 @@ object ReloadCommand : HandledSlashCommand {
event.hook.setEphemeral(true).sendMessage(AstralBotTextConfig.GENERIC_ERROR.get()).queue()
return
}
minecraftHandler?.updateWebhookClient()
CommandHandlingListener.updateCommands(guild) { msg ->
event.hook.setEphemeral(true).sendMessage(msg).queue()
}
Expand Down Expand Up @@ -84,6 +82,9 @@ object ChatSyncCommand : HandledSlashCommand {

AstralBotConfig.DISCORD_GUILD.set(guild!!.idLong)
AstralBotConfig.DISCORD_GUILD.save()

minecraftHandler?.updateWebhookClient()

success = true
}
event.hook.setEphemeral(true)
Expand Down

0 comments on commit e2a3d28

Please sign in to comment.