array-in-a-matrix/brainwine
1
0
Fork 0
mirror of https://github.com/array-in-a-matrix/brainwine.git synced 2025-04-02 11:11:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix versioned game config being cached incorrectly

Browse source
This commit is contained in:
kuroppoi 2023-01-20 20:54:44 +01:00
parent 9061c47c76
commit 27b136b68a
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gameserver/src/main/java/brainwine/gameserver/GameConfiguration.java
View file

@ -61,7 +61,7 @@ public class GameConfiguration {
Map<String, Object> config = MapHelper.copy(baseConfig);
configUpdates.forEach((version2, update) -> {
if(VersionUtils.isGreaterOrEqualTo(version2, version2)) {
if(VersionUtils.isGreaterOrEqualTo(version, version2)) {
merge(config, update);
}
});
@ -223,14 +223,17 @@ public class GameConfiguration {
}
public static Map<String, Object> getClientConfig(Player player) {
Map<String, Object> config = baseConfig;
Entry<String, Map<String, Object>> current = null;
for(Entry<String, Map<String, Object>> entry : versionedConfigs.entrySet()) {
if(VersionUtils.isGreaterOrEqualTo(player.getClientVersion(), entry.getKey())) {
config = entry.getValue();
String version = entry.getKey();
if((current == null || VersionUtils.isGreaterThan(version, current.getKey()))
&& VersionUtils.isGreaterOrEqualTo(player.getClientVersion(), version)) {
current = entry;
}
}
return config;
return current == null ? baseConfig : current.getValue();
}
}