NussNougate/crafty-4
2
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2025-01-18 09:05:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into bugfix/update-download-bedrock-url

Browse Source
This commit is contained in:
Zedifus 2024-10-02 22:50:20 +01:00
commit 00ab1747be
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -3,7 +3,8 @@
### New features ### New features
TBD TBD
### Bug fixes ### Bug fixes
TBD - Fix logic issue causing bedrock wizard's root files buttons to not respond to user click events ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/797))
- Reset crash detection counter after crash detection process detects successful start ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/798))
### Tweaks ### Tweaks
TBD TBD
### Lang ### Lang

4
app/classes/shared/server.py
View File

@ -1053,8 +1053,10 @@ class ServerInstance:
running = self.check_running() running = self.check_running()
# if all is okay, we just exit out # if all is okay, we set the restart count to 0 and just exit out
if running: if running:
Console.debug("Successfully found process. Resetting crash counter to 0")
self.restart_count = 0
return return
# check the exit code -- This could be a fix for /stop # check the exit code -- This could be a fix for /stop
if str(self.process.returncode) in self.settings["ignored_exits"].split(","): if str(self.process.returncode) in self.settings["ignored_exits"].split(","):

27
app/frontend/templates/server/bedrock_wizard.html
View File

@ -498,24 +498,19 @@
<script src="../../static/assets/js/shared/upload.js"></script> <script src="../../static/assets/js/shared/upload.js"></script>
<script> <script>
document.getElementById("root_upload_button").addEventListener("click", function (event) { document.getElementById("root_upload_button").addEventListener("click", function (event) {
if (file) { if (document.getElementById('root_upload_button').classList.contains('clicked')) {
upload = true; show_file_tree();
if (document.getElementById('root_upload_button').classList.contains('clicked')) { return;
document.getElementById('main-tree-div-upload').innerHTML = '<input type="radio" class="root-input" id="main-tree-input-upload" name="root_path" value="" checked><span id="main-tree-upload" class="files-tree-title tree-caret-down root-dir"><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
} else {
document.getElementById('root_upload_button').classList.add('clicked')
}
const token = getCookie("_xsrf");
var dialog = bootbox.dialog({
message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
closeButton: false
});
setTimeout(function () {
getDirView();
}, 2000);
} else { } else {
bootbox.alert("You must input a path before selecting this button"); document.getElementById('root_upload_button').classList.add('clicked')
} }
bootbox.dialog({
message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
closeButton: false
});
setTimeout(function () {
getDirView();
}, 2000);
}); });
function eula_confirm() { function eula_confirm() {