BUGFIX:

- /mission modify did accidentally load the original mission (without modifications)

Author: karel26

plugins/mission/commands.py

@@ -812,7 +812,7 @@ async def modify(self, interaction: discord.Interaction,
                         await server.restart(modify_mission=False)
                     # otherwise we load the new mission
                     else:
-                        await server.loadMission(new_filename, modify_mission=False)
+                        await server.loadMission(new_filename, modify_mission=False, use_orig=False)
                     message += _('\nMission reloaded.')
                     await self.bot.audit("changed preset {}".format(','.join(view.result)), server=server,
                                          user=interaction.user)

plugins/mission/listener.py

@@ -964,7 +964,7 @@ async def do_change_mission(self, server: Server, player: Player, params: dict):
             mission_file = await server.modifyMission(
                 mission_file, [utils.get_preset(self.node, x) for x in presets], use_orig
             )
-        await server.loadMission(mission_file, modify_mission=False)
+        await server.loadMission(mission_file, modify_mission=False, use_orig=False)
 
     @event(name="changeMission")
     async def changeMission(self, server: Server, data: dict) -> None:
@@ -1201,7 +1201,7 @@ async def change_preset(preset_name: str):
                 new_filename = await server.modifyMission(filename, preset)
                 if new_filename != filename:
                     await server.replaceMission(int(server.settings['listStartIndex']), new_filename)
-                    await server.loadMission(new_filename, modify_mission=False)
+                    await server.loadMission(new_filename, modify_mission=False, use_orig=False)
                 else:
                     await server.restart(modify_mission=False)
                 if server.status == Status.STOPPED:

plugins/mission/upload.py

@@ -93,7 +93,7 @@ async def _load_mission(self, filename: str):
                 modify = False
             msg = await self.channel.send(_('Loading mission {} ...').format(name))
             try:
-                if not await self.server.loadMission(filename, modify_mission=modify):
+                if not await self.server.loadMission(filename, modify_mission=modify, use_orig=False):
                     await msg.edit(content=_('Mission {} NOT loaded.').format(name))
                 else:
                     await self.bot.audit(f"loaded mission {name}", server=self.server, user=self.message.author)

plugins/scheduler/views.py

@@ -84,7 +84,7 @@ async def status_channel(self, interaction: discord.Interaction,
     @discord.ui.select(
         cls=discord.ui.ChannelSelect,
         channel_types=[ChannelType.text],
-        placeholder="Select a chat channel"
+        placeholder="Select a chat channel (optional)"
     )
     async def chat_channel(self, interaction: discord.Interaction, select: ChannelSelect[discord.TextChannel]) -> None:
         # noinspection PyUnresolvedReferences

plugins/voting/options/preset.py

@@ -28,7 +28,7 @@ async def execute(self, winner: str):
         new_filename = await self.server.modifyMission(filename, utils.get_preset(self.server.node, winner))
         if new_filename != filename:
             await self.server.replaceMission(int(self.server.settings['listStartIndex']), new_filename)
-            await self.server.loadMission(new_filename, modify_mission=False)
+            await self.server.loadMission(new_filename, modify_mission=False, use_orig=False)
         else:
             await self.server.restart(modify_mission=False)
         if self.server.status == Status.STOPPED: