From d81fe6f2a7f3f43054dbc27a4f5320229451aa91 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sat, 22 Nov 2025 16:39:47 -0600 Subject: [PATCH 1/2] Fix bedrock builder bug created when fixing bedrock updates --- app/classes/shared/import_helper.py | 6 ++++-- app/classes/shared/server.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/classes/shared/import_helper.py b/app/classes/shared/import_helper.py index a43e6388..213fec1a 100644 --- a/app/classes/shared/import_helper.py +++ b/app/classes/shared/import_helper.py @@ -222,7 +222,9 @@ class ImportHelpers: ) download_thread.start() - def download_threaded_bedrock_server(self, path, new_id, bedrock_url): + def download_threaded_bedrock_server( + self, path, new_id, bedrock_url, server_update=False + ): """ Downloads the latest Bedrock server, unzips it, sets necessary permissions. @@ -244,7 +246,7 @@ class ImportHelpers: unzip_path = self.helper.wtol_path(file_path) # unzips archive that was downloaded. - self.file_helper.unzip_file(unzip_path, True) + self.file_helper.unzip_file(unzip_path, server_update) # adjusts permissions for execution if os is not windows if not self.helper.is_os_windows(): diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index 86ff1546..b5dc31d9 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -1401,7 +1401,7 @@ class ServerInstance: if bedrock_url: # Use the new method for secure download self.import_helper.download_threaded_bedrock_server( - self.settings["path"], self.server_id, bedrock_url + self.settings["path"], self.server_id, bedrock_url, True ) downloaded = True except Exception as e: -- GitLab From c8376186e3aa9b75aa163d4892b43d34a67baa87 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sun, 23 Nov 2025 02:27:45 +0000 Subject: [PATCH 2/2] Update changelog !919 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb9bc75b..343728f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ - Fix import directory cleanup was not pointing to the proper directory ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/918)) - Fix survey not appearing on first login ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/917)) - Fix failue deleting server's DB files on server delete ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/916)) -- Fix server.properties overwritten in bedrock update ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/915)) +- Fix server.properties overwritten in bedrock update ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/915) | [Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/919)) - Fix zip backup download button always downloading the most recent, not the selected backup ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/913)) - Fix download button showing for snapshot backups ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/913)) ### Tweaks -- GitLab