Skip to content

Commit

Permalink
Merge branch 'main' into server-stare-refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
2mal3 authored Dec 6, 2024
2 parents ed06a2d + fe312d6 commit f794365
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion somnus/discord_provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ async def on_ready():
inactvity_seconds = CONFIG.INACTIVITY_SHUTDOWN_MINUTES * 60
update_players_online_status.start()
await _update_bot_presence()
log.info(f"Logged in as {bot.user} (ID: {bot.user.id})")


async def _get_world_choices(interaction: discord.Interaction, current: str):
Expand Down Expand Up @@ -408,7 +409,6 @@ async def _start_minecraft_server(ctx: discord.Interaction, steps: int, message:
return False

log.info("Server started!")
# await _update_bot_presence()
global inactvity_seconds # noqa: PLW0603
inactvity_seconds = CONFIG.INACTIVITY_SHUTDOWN_MINUTES * 60
update_players_online_status.start()
Expand Down
2 changes: 1 addition & 1 deletion somnus/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
}
},
"reset_busy": {
"description": "Falls der Bot fälschlicherweise beschäftigt ist, kann dieser Befehl den falschen Busy-State zurücksetzen.",
"description": "Falls der Bot irrtümlich beschäftigt ist, kann dieser Befehl den falschen Busy-State zurücksetzen.",
"verification": "Möchtest du wirklich den Busy-State zurücksetzen? Dadurch können Fehler entstehen, die bis zum Absturz des Bots führen können.",
"success": "Der Busy-State wurde erfolgreich zurückgesetzt.",
"canceled": "Das Zurücksetzen des Busy-States wurde abgebrochen.",
Expand Down
2 changes: 1 addition & 1 deletion somnus/logic/world_selector.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,10 @@ async def _get_world_selector_config_from_path(path: str) -> WorldSelectorConfig

def _get_default_world_selector_config(config: Config = CONFIG) -> WorldSelectorConfig:
data = WorldSelectorConfig(
new_selected_world="",
current_world="Minecraft",
worlds=[
WorldSelectorWorld(
new_selected_world="",
display_name="Minecraft",
start_cmd=config.MC_SERVER_START_CMD,
start_cmd_sudo=config.MC_SERVER_START_CMD_SUDO,
Expand Down

0 comments on commit f794365

Please sign in to comment.