Merge branch 'bugfix/server-id-stack' into 'dev'

Fix bug where invalid server Id leads to stack

See merge request crafty-controller/crafty-4!690
This commit is contained in:
Iain Powrie 2024-01-16 19:10:15 +00:00
commit 5a96fa10cd
2 changed files with 5 additions and 1 deletions

View File

@ -4,6 +4,7 @@
- Use Papermc Group's API for `paper` & `folia` builds in server builder ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/688))
### Bug fixes
- Fix bukkit and downstream fork MOTD crash ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/686))
- Fix bug where invalid server Id leads to stack ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/690))
### Tweaks
- Refactor Forge server initialisation flow for newer versions ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/687))
### Lang

View File

@ -462,7 +462,10 @@ class ServersController(metaclass=Singleton):
@staticmethod
def server_id_exists(server_id):
srv = ServersController().get_server_instance_by_id(server_id)
try:
srv = ServersController().get_server_instance_by_id(server_id)
except ValueError:
return False
return srv.stats_helper.server_id_exists()
@staticmethod