From 69f915616b9c38bfd61bfab79c9303bda1704c37 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Tue, 5 Jul 2022 16:15:49 -0400 Subject: [PATCH 1/2] Fix unhandled serverjars api error on server creation --- app/classes/web/server_handler.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/classes/web/server_handler.py b/app/classes/web/server_handler.py index 3505e1de..a649f4ac 100644 --- a/app/classes/web/server_handler.py +++ b/app/classes/web/server_handler.py @@ -156,6 +156,9 @@ class ServerHandler(BaseHandler): page_data["js_server_types"] = json.dumps( self.controller.server_jars.get_serverjar_data() ) + if page_data["server_types"] is None: + page_data["server_types"] = [] + page_data["js_server_types"] = [] template = "server/wizard.html" if page == "bedrock_step1": From 764d9c3905f2c70ceef0e7de7ec02b3f7d3d6986 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Tue, 5 Jul 2022 23:38:53 +0100 Subject: [PATCH 2/2] Update changelog !392 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a211def5..c26732ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ None ### Bug fixes - Remove redundant path check on backup restore ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/390)) - Fix issue with stats pinging on slow starting servers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/391)) +- Fix unhandled exeption when serverjars api returns 'None' ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/392)) ### Tweaks None ### Lang