diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 82ce570..0a0003a 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 @@ -49,6 +50,11 @@ 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/figuredata.xml ./Havana/ + sudo mkdir ./Havana/tools/www + sudo mkdir ./Havana/tools/www-tpl + sudo mv tools/www-tpl/* ./Havana/tools/www-tpl/ sudo cp tools/scripts/README.txt ./Havana/ - id: sha-short @@ -67,4 +73,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 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; } }