OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 23:38:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't enforce icanhasbukkit default if alias block exists

Browse source
This commit is contained in:
TheMeinerLP 2023-06-13 16:10:59 +02:00
parent 8ad0899aca
commit a652ca1f5c
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
View file

@ -358,7 +358,11 @@ public final class CraftServer implements Server {
} }
this.commandsConfiguration = YamlConfiguration.loadConfiguration(this.getCommandsConfigFile()); this.commandsConfiguration = YamlConfiguration.loadConfiguration(this.getCommandsConfigFile());
this.commandsConfiguration.options().copyDefaults(true); this.commandsConfiguration.options().copyDefaults(true);
this.commandsConfiguration.setDefaults(YamlConfiguration.loadConfiguration(new InputStreamReader(this.getClass().getClassLoader().getResourceAsStream("configurations/commands.yml"), Charsets.UTF_8))); // Paper start - don't enforce icanhasbukkit default if alias block exists
final YamlConfiguration commandsDefaults = YamlConfiguration.loadConfiguration(new InputStreamReader(this.getClass().getClassLoader().getResourceAsStream("configurations/commands.yml"), Charsets.UTF_8));
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.saveCommandsConfig(); this.saveCommandsConfig();
// Migrate aliases from old file and add previously implicit $1- to pass all arguments // Migrate aliases from old file and add previously implicit $1- to pass all arguments