2017-11-18 04:04:21 +01:00
|
|
|
From f9e9f1781bdcaa1043638e0e18324cec41cb9978 Mon Sep 17 00:00:00 2001
|
2016-11-28 16:24:22 +01:00
|
|
|
From: willies952002 <admin@domnian.com>
|
|
|
|
Date: Mon, 28 Nov 2016 10:21:52 -0500
|
|
|
|
Subject: [PATCH] Allow Reloading of Command Aliases
|
|
|
|
|
|
|
|
Reload the aliases stored in commands.yml
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2017-11-18 04:04:21 +01:00
|
|
|
index 1bc394ada..15d572489 100644
|
2016-11-28 16:24:22 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2017-11-18 04:04:21 +01:00
|
|
|
@@ -1890,5 +1890,24 @@ public final class CraftServer implements Server {
|
2017-01-06 22:45:59 +01:00
|
|
|
});
|
2016-11-28 16:24:22 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
2017-03-12 18:19:04 +01:00
|
|
|
+ public boolean reloadCommandAliases() {
|
2016-11-28 16:24:22 +01:00
|
|
|
+ Set<String> removals = getCommandAliases().keySet().stream()
|
|
|
|
+ .map(key -> key.toLowerCase(java.util.Locale.ENGLISH))
|
|
|
|
+ .collect(java.util.stream.Collectors.toSet());
|
|
|
|
+ getCommandMap().getKnownCommands().keySet().removeIf(removals::contains);
|
2017-03-12 18:19:04 +01:00
|
|
|
+ File file = getCommandsConfigFile();
|
|
|
|
+ try {
|
|
|
|
+ commandsConfiguration.load(file);
|
|
|
|
+ } catch (FileNotFoundException ex) {
|
|
|
|
+ return false;
|
|
|
|
+ } catch (IOException | org.bukkit.configuration.InvalidConfigurationException ex) {
|
|
|
|
+ Bukkit.getLogger().log(Level.SEVERE, "Cannot load " + file, ex);
|
|
|
|
+ return false;
|
|
|
|
+ }
|
2016-11-28 16:24:22 +01:00
|
|
|
+ commandMap.registerServerAliases();
|
2017-03-12 18:19:04 +01:00
|
|
|
+ return true;
|
2016-11-28 16:24:22 +01:00
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
}
|
|
|
|
--
|
2017-11-18 04:04:21 +01:00
|
|
|
2.15.0
|
2016-11-28 16:24:22 +01:00
|
|
|
|