SteamWar/SteamWar
10
2
Fork 0
Code Issues 56 Pull Requests 10 Packages Projects 3 Releases Wiki Activity

Merge branch 'main' into exposed

Browse Source 
# Conflicts:
#	CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
#	CommonCore/SQL/src/de/steamwar/sql/Punishment.java
This commit is contained in:
Chaoscaot
2025-11-05 16:18:30 +01:00
parent 89e2df0eb2 73b3d21749
commit b2a4b05545
17 changed files with 138 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
View File

@@ -26,7 +26,7 @@ class SQLWrapperImpl: SQLWrapper<String> {
return File("/configs/GameModes")
}
override fun loadGameModeConfig(file: File): GameModeConfig<String, String> {
override fun loadGameModeConfig(file: File?): GameModeConfig<String, String> {
return GameModeConfig(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear, true)
}