SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix writing headers and update to be more papery (#12459)

Browse Source
This commit is contained in:
Isaac - The456
2025-04-21 19:38:07 +01:00
committed by GitHub
parent 04b91129a5
commit def0532ffc
7 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@@ -432,7 +432,9 @@ public final class CraftServer implements Server {
this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile());
this.configuration.options().copyDefaults(true);
this.configuration.setDefaults(YamlConfiguration.loadConfiguration(new InputStreamReader(this.getClass().getClassLoader().getResourceAsStream("configurations/bukkit.yml"), StandardCharsets.UTF_8)));
YamlConfiguration configurationDefaults = YamlConfiguration.loadConfiguration(new InputStreamReader(this.getClass().getClassLoader().getResourceAsStream("configurations/bukkit.yml"), StandardCharsets.UTF_8));
this.configuration.setDefaults(configurationDefaults);
this.configuration.options().setHeader(configurationDefaults.options().getHeader());
ConfigurationSection legacyAlias = null;
if (!this.configuration.isString("aliases")) {
legacyAlias = this.configuration.getConfigurationSection("aliases");
@@ -449,6 +451,7 @@ public final class CraftServer implements Server {
if (this.commandsConfiguration.contains("aliases")) commandsDefaults.set("aliases", null);
this.commandsConfiguration.setDefaults(commandsDefaults);
// Paper end - don't enforce icanhasbukkit default if alias block exists
this.commandsConfiguration.options().setHeader(commandsDefaults.options().getHeader());
this.saveCommandsConfig();
// Migrate aliases from old file and add previously implicit $1- to pass all arguments

5
paper-server/src/main/java/org/bukkit/craftbukkit/help/HelpYamlReader.java
View File

@@ -32,11 +32,10 @@ public class HelpYamlReader {
this.helpYaml = YamlConfiguration.loadConfiguration(helpYamlFile);
this.helpYaml.options().copyDefaults(true);
this.helpYaml.setDefaults(defaultConfig);
this.helpYaml.options().setHeader(defaultConfig.options().getHeader());
try {
if (!helpYamlFile.exists()) {
this.helpYaml.save(helpYamlFile);
}
this.helpYaml.save(helpYamlFile);
} catch (IOException ex) {
server.getLogger().log(Level.SEVERE, "Could not save " + helpYamlFile, ex);
}