SteamWar/Velocity
13
0
Fork 0
geforkt von Mirrors/Velocity
Code Issues Pull-Requests Aktivität

Fix starting the proxy without any config. Fixes #359

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Andrew Steinborn 2020-08-21 12:42:15 -04:00
Ursprung a6ddc137ee
Commit d8dba436d6
1 geänderte Dateien mit 6 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

11
proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
Datei anzeigen

@ -15,6 +15,7 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.URL;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
@ -398,10 +399,11 @@ public class VelocityConfiguration implements ProxyConfig {
* @throws IOException if we could not read from the {@code path}. * @throws IOException if we could not read from the {@code path}.
*/ */
public static VelocityConfiguration read(Path path) throws IOException { public static VelocityConfiguration read(Path path) throws IOException {
String defaultResource = "default-velocity.toml"; URL defaultConfigLocation = VelocityConfiguration.class.getClassLoader()
.getResource("default-velocity.toml");
boolean mustResave = false; boolean mustResave = false;
CommentedFileConfig config = CommentedFileConfig.builder(path) CommentedFileConfig config = CommentedFileConfig.builder(path)
.defaultResource(defaultResource) .defaultData(defaultConfigLocation)
.autosave() .autosave()
.preserveInsertionOrder() .preserveInsertionOrder()
.sync() .sync()
@ -409,12 +411,11 @@ public class VelocityConfiguration implements ProxyConfig {
config.load(); config.load();
// Create temporary default configuration // Create temporary default configuration
File tmpFile = File.createTempFile(defaultResource, null); File tmpFile = File.createTempFile("default-config", null);
tmpFile.deleteOnExit(); tmpFile.deleteOnExit();
// Copy over default file to tmp location // Copy over default file to tmp location
ClassLoader loader = VelocityConfiguration.class.getClassLoader(); try (InputStream in = defaultConfigLocation.openStream()) {
try (InputStream in = loader.getResourceAsStream(defaultResource)) {
Files.copy(Objects.requireNonNull(in), tmpFile.toPath(), StandardCopyOption.REPLACE_EXISTING); Files.copy(Objects.requireNonNull(in), tmpFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
} }
CommentedFileConfig defaultConfig = CommentedFileConfig.of(tmpFile, TomlFormat.instance()); CommentedFileConfig defaultConfig = CommentedFileConfig.of(tmpFile, TomlFormat.instance());