Mirrors/ViaVersion
3
0
Fork 1
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-11-20 06:50:08 +01:00
Code Issues Releases Aktivität

Handle invalid config data types (#3595)

Quellcode durchsuchen
Dieser Commit ist enthalten in:
RK_01 2023-12-26 13:18:55 +01:00 committet von GitHub
Ursprung 84b093a997
Commit 64c436c2e1
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
1 geänderte Dateien mit 10 neuen und 18 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

28
common/src/main/java/com/viaversion/viaversion/util/Config.java
Datei anzeigen

@ -18,12 +18,15 @@
package com.viaversion.viaversion.util; package com.viaversion.viaversion.util;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.viaversion.viaversion.api.Via;
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 com.viaversion.viaversion.libs.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import com.viaversion.viaversion.libs.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
import com.viaversion.viaversion.libs.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import com.viaversion.viaversion.libs.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
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,9 +38,6 @@ 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 {
@ -167,7 +167,7 @@ public abstract class Config {
public boolean getBoolean(String key, boolean def) { public boolean getBoolean(String key, boolean def) {
Object o = this.config.get(key); Object o = this.config.get(key);
if (o != null) { if (o instanceof Boolean) {
return (boolean) o; return (boolean) o;
} else { } else {
return def; return def;
@ -176,7 +176,7 @@ public abstract class Config {
public @Nullable String getString(String key, @Nullable String def) { public @Nullable String getString(String key, @Nullable String def) {
final Object o = this.config.get(key); final Object o = this.config.get(key);
if (o != null) { if (o instanceof String) {
return (String) o; return (String) o;
} else { } else {
return def; return def;
@ -185,12 +185,8 @@ public abstract class Config {
public int getInt(String key, int def) { public int getInt(String key, int def) {
Object o = this.config.get(key); Object o = this.config.get(key);
if (o != null) { if (o instanceof Number) {
if (o instanceof Number) { return ((Number) o).intValue();
return ((Number) o).intValue();
} else {
return def;
}
} else { } else {
return def; return def;
} }
@ -198,12 +194,8 @@ public abstract class Config {
public double getDouble(String key, double def) { public double getDouble(String key, double def) {
Object o = this.config.get(key); Object o = this.config.get(key);
if (o != null) { if (o instanceof Number) {
if (o instanceof Number) { return ((Number) o).doubleValue();
return ((Number) o).doubleValue();
} else {
return def;
}
} else { } else {
return def; return def;
} }