Upstream
/
ViaVersion
mirror of https://github.com/ViaVersion/ViaVersion.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix config read/write error when parent file is null (#3783)

This commit is contained in:
RK_01 2024-04-10 17:35:25 +02:00 committed by GitHub
parent 0c2c8400ae
commit 2586788bf6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/src/main/java/com/viaversion/viaversion/util/Config.java
View File

@ -21,9 +21,6 @@ import com.google.gson.JsonElement;
import com.viaversion.viaversion.compatibility.YamlCompat; import com.viaversion.viaversion.compatibility.YamlCompat;
import com.viaversion.viaversion.compatibility.unsafe.Yaml1Compat; import com.viaversion.viaversion.compatibility.unsafe.Yaml1Compat;
import com.viaversion.viaversion.compatibility.unsafe.Yaml2Compat; import com.viaversion.viaversion.compatibility.unsafe.Yaml2Compat;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
@ -35,6 +32,9 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
@SuppressWarnings("VulnerableCodeUsages") @SuppressWarnings("VulnerableCodeUsages")
public abstract class Config { public abstract class Config {
@ -148,7 +148,9 @@ public abstract class Config {
} }
public void save() { public void save() {
this.configFile.getParentFile().mkdirs(); if (this.configFile.getParentFile() != null) {
this.configFile.getParentFile().mkdirs();
}
save(this.configFile, this.config); save(this.configFile, this.config);
} }
@ -157,7 +159,9 @@ public abstract class Config {
} }
public void reload() { public void reload() {
this.configFile.getParentFile().mkdirs(); if (this.configFile.getParentFile() != null) {
this.configFile.getParentFile().mkdirs();
}
this.config = new ConcurrentSkipListMap<>(loadConfig(this.configFile)); this.config = new ConcurrentSkipListMap<>(loadConfig(this.configFile));
} }
@ -245,4 +249,4 @@ public abstract class Config {
return null; return null;
} }
} }
} }