BUGFIX:

- Scheduler: mission_id / mission_file was not processed correctly on populated servers

Author: karel26

plugins/mission/commands.py

@@ -379,7 +379,7 @@ async def _load(self, interaction: discord.Interaction, server: Server, mission:
             if mission_id and result == 'later':
                 # make sure, we load that mission, independently on what happens to the server
                 await server.setStartIndex(mission_id + 1)
-                server.on_empty = {"command": "load", "id": mission_id + 1, "user": interaction.user}
+                server.on_empty = {"command": "load", "mission_id": mission_id + 1, "user": interaction.user}
                 await interaction.followup.send(
                     _('Mission {} will be loaded when server is empty or on the next restart.').format(name),
                     ephemeral=ephemeral)

plugins/scheduler/commands.py

@@ -243,6 +243,11 @@ async def restart_mission(self, server: Server, config: dict, rconf: dict, max_w
             if not rconf.get('populated', True) and not rconf.get('max_mission_time'):
                 if not server.on_empty:
                     server.on_empty = {'command': method}
+                    if method == 'load':
+                        if 'mission_id' in rconf:
+                            server.on_empty['mission_id'] = rconf['mission_id']
+                        elif 'mission_file' in rconf:
+                            server.on_empty['mission_file'] = rconf['mission_file']
                     self.log.debug("Scheduler: Setting on_empty trigger.")
                 server.restart_pending = True
                 return

plugins/scheduler/listener.py

@@ -118,7 +118,7 @@ async def process(self, server: Server, what: dict) -> None:
             asyncio.create_task(self.bot.audit(f"{self.plugin_name.title()} rotated to mission "
                                                f"{server.current_mission.display_name}", server=server))
         elif what['command'] == 'load':
-            if not await server.loadMission(what['id']):
+            if not await server.loadMission(what.get('mission_id', what.get('mission_file'))):
                 self.log.warning(f"Mission {server.current_mission.display_name} NOT loaded.")
             else:
                 message = f'loaded mission {server.current_mission.display_name}'