min() fixed on customize

early events fixed

Author: karel26

plugins/tournament/listener.py

@@ -187,7 +187,7 @@ async def disqualify(self, server: Server, player: Player, reason: str) -> None:
 
     @event(name="onMissionEvent")
     async def onMissionEvent(self, server: Server, data: dict) -> None:
-        if not self.round_started[server.name]:
+        if not self.round_started.get(server.name, False):
             if data['eventName'] in ['S_EVENT_RUNWAY_TAKEOFF', 'S_EVENT_TAKEOFF']:
                 reason = _('Disqualified due to early takeoff.')
             elif data['eventName'] in ['S_EVENT_SHOT', 'S_EVENT_HIT', 'S_EVENT_KILL'] and data['target']:
@@ -465,7 +465,7 @@ async def wait_until_choices_finished(self, server: Server):
             if time_to_choose - time in [300, 180, 60]:
                 await self.inform_squadrons(
                     server,
-                    message="## :warning: The next round will start in {}!".format(
+                    message=":warning: The next round will start in {}!".format(
                         utils.format_time(time_to_choose - time))
                 )
             await asyncio.sleep(1)

plugins/tournament/view.py

@@ -261,7 +261,7 @@ async def add_choice(self, interaction: discord.Interaction):
         ticket_name = self.config['presets']['choices'][choice].get('ticket')
         ticket_count = tickets.get(ticket_name, 99)
 
-        max_num = max(self.config['presets']['choices'][choice].get('max', 99), ticket_count)
+        max_num = min(self.config['presets']['choices'][choice].get('max', 99), ticket_count)
         if not max_num or max_num > 1:
             modal = NumbersModal(choice, costs, squadron.points, max_num)
             # noinspection PyUnresolvedReferences