Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
YoyoNow
2025-03-08 17:44:55 +01:00
parent b60111e717 644cc9da84
commit 911a08a156
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.java
+1 -1
View File
@@ -335,7 +335,7 @@ public class SteamwarUser {
public boolean verifyPassword(String password) { public boolean verifyPassword(String password) {
try { try {
if (this.password == null) { if (!hasPassword()) {
return false; return false;
} }
VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
+1 -1
View File
@@ -110,7 +110,7 @@ public class ServerStarter {
fightMap = eventFight.getMap(); fightMap = eventFight.getMap();
gameMode = eventFight.getSpielmodus(); gameMode = eventFight.getSpielmodus();
String serverName = Team.get(eventFight.getTeamBlue()).getTeamKuerzel() + " vs " + Team.get(eventFight.getTeamRed()).getTeamKuerzel(); String serverName = Team.get(eventFight.getTeamBlue()).getTeamKuerzel() + "_vs_" + Team.get(eventFight.getTeamRed()).getTeamKuerzel();
serverNameProvider = port -> serverName; serverNameProvider = port -> serverName;
worldName = serverToWorldName(serverName + eventFight.getStartTime().toLocalDateTime().format(DateTimeFormatter.ISO_TIME)); worldName = serverToWorldName(serverName + eventFight.getStartTime().toLocalDateTime().format(DateTimeFormatter.ISO_TIME));
return this; return this;
WebsiteBackend/src/de/steamwar/Application.kt
+1
View File
@@ -48,6 +48,7 @@ fun main() {
while (true) { while (true) {
Thread.sleep(1000 * 10) Thread.sleep(1000 * 10)
ResponseUser.clearCache() ResponseUser.clearCache()
SteamwarUser.clear()
} }
}.start() }.start()
embeddedServer(Netty, port = 1337, host = "127.0.0.1", module = Application::module) embeddedServer(Netty, port = 1337, host = "127.0.0.1", module = Application::module)
WebsiteBackend/src/de/steamwar/routes/Auth.kt
+1
View File
@@ -61,6 +61,7 @@ fun Route.configureAuth() {
post { post {
val request = call.receive<UsernamePassword>() val request = call.receive<UsernamePassword>()
SteamwarUser.clear()
val user = SteamwarUser.get(request.name) val user = SteamwarUser.get(request.name)
val valid = user?.verifyPassword(request.password) ?: false val valid = user?.verifyPassword(request.password) ?: false