From d9565b45aa405d4a1f2982222a48ac52d3928653 Mon Sep 17 00:00:00 2001 From: Quackster Date: Sat, 1 Oct 2022 08:17:45 +1000 Subject: [PATCH 1/4] Copy .sql on workflow build --- .github/workflows/pre-release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 82ce570..319f8ef 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -49,6 +49,7 @@ jobs: sudo cp tools/scripts/run_server.sh ./Havana/ sudo cp tools/scripts/run_web.bat ./Havana/ sudo cp tools/scripts/run_web.sh ./Havana/ + sudo cp tools/havana.sql ./Havana/ sudo cp tools/scripts/README.txt ./Havana/ - id: sha-short @@ -67,4 +68,4 @@ jobs: prerelease: true title: "Development Build ${{ steps.sha-short.outputs.sha-short }}" files: | - Havana-${{ steps.sha-short.outputs.sha-short }}.zip \ No newline at end of file + Havana-${{ steps.sha-short.outputs.sha-short }}.zip From 75e3aa279b7f84072d7f4bac5f305cafd676c25f Mon Sep 17 00:00:00 2001 From: Quackster Date: Sat, 1 Oct 2022 12:57:26 +1000 Subject: [PATCH 2/4] Copy more files over into release --- .github/workflows/pre-release.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 319f8ef..709e530 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -41,6 +41,7 @@ jobs: sudo rm -rf ./release/Havana-Server/bin sudo mkdir ./Havana sudo mkdir ./Havana/lib + sudo mkdir ./Havana/tools sudo mv ./release/Havana-Web/lib/Havana-Server.jar ./Havana/Havana-Server.jar sudo mv ./release/Havana-Web/lib/Havana-Web.jar ./Havana/Havana-Web.jar sudo mv ./release/Havana-Web/lib/* ./Havana/lib @@ -50,6 +51,10 @@ jobs: sudo cp tools/scripts/run_web.bat ./Havana/ sudo cp tools/scripts/run_web.sh ./Havana/ sudo cp tools/havana.sql ./Havana/ + sudo cp tools/figuredata.xml ./Havana/ + sudo mkdir ./Havana/tools/www + sudo mkdir ./Havana/tools/www-tpl + sudo cp tools/www-tpl/* ./Havana/tools/www-tpl/ sudo cp tools/scripts/README.txt ./Havana/ - id: sha-short From 72c3294c8be807e3b13e259065ee493778d46fca Mon Sep 17 00:00:00 2001 From: Quackster Date: Sat, 1 Oct 2022 12:58:39 +1000 Subject: [PATCH 3/4] Fix login --- .../src/main/java/org/alexdev/havana/dao/mysql/PlayerDao.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Havana-Server/src/main/java/org/alexdev/havana/dao/mysql/PlayerDao.java b/Havana-Server/src/main/java/org/alexdev/havana/dao/mysql/PlayerDao.java index 47f06e1..5fdadf5 100644 --- a/Havana-Server/src/main/java/org/alexdev/havana/dao/mysql/PlayerDao.java +++ b/Havana-Server/src/main/java/org/alexdev/havana/dao/mysql/PlayerDao.java @@ -353,6 +353,7 @@ public class PlayerDao { String databasePassword = resultSet.getString("password"); if (PlayerManager.getInstance().passwordMatches(databasePassword, password)) { + fill(playerDetails, resultSet); success = true; } } From dc27340999f1dfdd8a00267b5e45017729c250ec Mon Sep 17 00:00:00 2001 From: Quackster Date: Sat, 1 Oct 2022 13:04:19 +1000 Subject: [PATCH 4/4] Fix moving multiple template files --- .github/workflows/pre-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 709e530..0a0003a 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -54,7 +54,7 @@ jobs: sudo cp tools/figuredata.xml ./Havana/ sudo mkdir ./Havana/tools/www sudo mkdir ./Havana/tools/www-tpl - sudo cp tools/www-tpl/* ./Havana/tools/www-tpl/ + sudo mv tools/www-tpl/* ./Havana/tools/www-tpl/ sudo cp tools/scripts/README.txt ./Havana/ - id: sha-short