Timerix/minecraft-launcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some fixes

Browse Source
This commit is contained in:
Timerix22 2024-01-07 01:13:33 +06:00
parent ca8825dcd7
commit 7aaf2acab4
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/build_all.yml vendored
View File

@ -59,7 +59,10 @@ jobs:
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v3
with: with:
name: minecraft-launcher-server name: minecraft-launcher-server
- name: chmod
run: chmod +x minecraft-launcher-server
- name: Prepare ssh - name: Prepare ssh
env: env:
SSH_FINGERPRINT: ${{secrets.SSH_FINGERPRINT}} SSH_FINGERPRINT: ${{secrets.SSH_FINGERPRINT}}
@ -67,7 +70,7 @@ jobs:
mkdir -p ~/.ssh mkdir -p ~/.ssh
echo "$SSH_FINGERPRINT" >> ~/.ssh/known_hosts echo "$SSH_FINGERPRINT" >> ~/.ssh/known_hosts
shell: bash shell: bash
- name: Upload files - name: Upload files
env: env:
SSHPASS: ${{secrets.SSH_PASSWORD}} SSHPASS: ${{secrets.SSH_PASSWORD}}

16
minecraft-launcher-server/Server.cs
View File

@ -38,7 +38,8 @@ static class Server
Config = ServerConfig.LoadOrCreateDefault(); Config = ServerConfig.LoadOrCreateDefault();
CheckUpdates(); CheckUpdates();
updateCheckTimer = new Timer(true, 5 * 60 * 1000, CheckUpdates); // check for updates every minute
updateCheckTimer = new Timer(true, 60 * 1000, CheckUpdates);
updateCheckTimer.Start(); updateCheckTimer.Start();
@ -89,7 +90,9 @@ static class Server
File.Move(exeFileNew, exeFile, true); File.Move(exeFileNew, exeFile, true);
Environment.Exit(0); Environment.Exit(0);
} }
else File.Move(updatedFilePath, relativeFilePath, true);
logger.LogDebug(nameof(CheckUpdates), "updating file "+relativeFilePath);
File.Move(updatedFilePath, relativeFilePath, true);
} }
catch (Exception e) catch (Exception e)
{ {
@ -97,9 +100,12 @@ static class Server
+ e.ToStringDemystified()); + e.ToStringDemystified());
} }
} }
logger.LogInfo(nameof(CheckUpdates), "creating manifests..."); if(updatedFiles.Count != 0)
Manifests.CreateAllManifests(); {
logger.LogInfo(nameof(CheckUpdates), "manifests created"); logger.LogInfo(nameof(CheckUpdates), "creating manifests...");
Manifests.CreateAllManifests();
logger.LogInfo(nameof(CheckUpdates), "manifests created");
}
logger.LogInfo(nameof(CheckUpdates), "update check completed"); logger.LogInfo(nameof(CheckUpdates), "update check completed");
} }