24 Zeilen
1.7 KiB
Diff
24 Zeilen
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: TheMeinerLP <p.glanz@madfix.me>
|
||
|
|
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 9f8c5ceb8485b14a84f2a7b2ffc8192be5c6bdfd..59984cb8ba9ffb66b59a2c907e4f04b5a51ea8ed 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||
|
|
@@ -351,7 +351,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(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(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
|