From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: TheMeinerLP Date: Tue, 13 Jun 2023 16:10:59 +0200 Subject: [PATCH] Don't enforce icanhasbukkit default if alias block exists diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 64c3eafd2b676938017b43bf46ea6a0e0f324fd6..9d86b54a9945d4644f7920e06e5d04faaaa2e8c8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -361,7 +361,11 @@ public final class CraftServer implements Server { } this.commandsConfiguration = YamlConfiguration.loadConfiguration(this.getCommandsConfigFile()); 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 stop - dont enforce icanhasbukkit default if alias block exists this.saveCommandsConfig(); // Migrate aliases from old file and add previously implicit $1- to pass all arguments