mirrors/Havana
1
Fork 0
mirror of https://github.com/Quackster/Havana.git synced 2025-07-03 21:27:46 +00:00
Code Activity

Merge branch 'develop'

Browse source
This commit is contained in:
Quackster 2022-10-01 13:04:23 +10:00
commit a231aa59c5
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/pre-release.yml vendored
View file

@ -41,6 +41,7 @@ jobs:
sudo rm -rf ./release/Havana-Server/bin sudo rm -rf ./release/Havana-Server/bin
sudo mkdir ./Havana sudo mkdir ./Havana
sudo mkdir ./Havana/lib 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-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-Web.jar ./Havana/Havana-Web.jar
sudo mv ./release/Havana-Web/lib/* ./Havana/lib 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_server.sh ./Havana/
sudo cp tools/scripts/run_web.bat ./Havana/ sudo cp tools/scripts/run_web.bat ./Havana/
sudo cp tools/scripts/run_web.sh ./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/ sudo cp tools/scripts/README.txt ./Havana/
- id: sha-short - id: sha-short

1
Havana-Server/src/main/java/org/alexdev/havana/dao/mysql/PlayerDao.java
View file

@ -353,6 +353,7 @@ public class PlayerDao {
String databasePassword = resultSet.getString("password"); String databasePassword = resultSet.getString("password");
if (PlayerManager.getInstance().passwordMatches(databasePassword, password)) { if (PlayerManager.getInstance().passwordMatches(databasePassword, password)) {
fill(playerDetails, resultSet);
success = true; success = true;
} }
} }