mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 04:56:50 +01:00
57dd397155
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes:77fd87e4SPIGOT-2304: Implement LootGenerateEventa1a705eeSPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent41712eddSPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
From db3026a6dd32a4b49e38ed655140d043ebd45ed7 Mon Sep 17 00:00:00 2001
|
|
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
|
|
index a27783dcf3..3cb57c3b8c 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -2118,5 +2118,24 @@ public final class CraftServer implements Server {
|
|
DefaultPermissions.registerCorePermissions();
|
|
CraftDefaultPermissions.registerCorePermissions();
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public boolean reloadCommandAliases() {
|
|
+ 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);
|
|
+ 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;
|
|
+ }
|
|
+ commandMap.registerServerAliases();
|
|
+ return true;
|
|
+ }
|
|
// Paper end
|
|
}
|
|
--
|
|
2.26.2
|
|
|