diff --git a/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch b/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch index adc863e340..ffb0e240d8 100644 --- a/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch +++ b/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch @@ -1,4 +1,4 @@ -From a7bb808c73465c11139f17b0d498acd2b3a3cb58 Mon Sep 17 00:00:00 2001 +From 2abc7e46c1a919472d96956f54c2a7fed3a64452 Mon Sep 17 00:00:00 2001 From: William Date: Fri, 18 Mar 2016 03:28:07 -0400 Subject: [PATCH] Add command to reload permissions.yml and require confirm to @@ -35,10 +35,10 @@ index 18549ce0..032d6211 100644 + void reloadPermissions(); // Paper } diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java -index c70d5129..040509c1 100644 +index 0ab7e295..f331a442 100644 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java -@@ -11,15 +11,36 @@ public class ReloadCommand extends BukkitCommand { +@@ -13,15 +13,36 @@ public class ReloadCommand extends BukkitCommand { public ReloadCommand(String name) { super(name); this.description = "Reloads the server configuration and plugins"; @@ -76,15 +76,15 @@ index c70d5129..040509c1 100644 Command.broadcastCommandMessage(sender, ChatColor.RED + "Please note that this command is not supported and may cause issues when using some plugins."); Command.broadcastCommandMessage(sender, ChatColor.RED + "If you encounter any issues please use the /stop command to restart your server."); Bukkit.reload(); -@@ -32,7 +53,8 @@ public class ReloadCommand extends BukkitCommand { +@@ -31,7 +52,7 @@ public class ReloadCommand extends BukkitCommand { + } + @Override - public java.util.List tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException - { -- return java.util.Collections.emptyList(); +- public List tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException { +- return Collections.emptyList(); ++ public java.util.List tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException { + return java.util.Collections.singletonList("permissions"); // Paper } - // Spigot End -+ } diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java index b88f31ca..bd0588a2 100644 @@ -105,5 +105,5 @@ index b88f31ca..bd0588a2 100644 + } -- -2.14.3 +2.14.1 diff --git a/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch b/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch index 47dd2c5537..3f9c556322 100644 --- a/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From 65b664ebccc15a537ec64b3a777ba6481259dde4 Mon Sep 17 00:00:00 2001 +From 9ef921b8843cc53222d4ebed32ea4992e95dee87 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Mon, 28 Nov 2016 10:16:39 -0500 Subject: [PATCH] Allow Reloading of Command Aliases @@ -70,10 +70,10 @@ index 762eb1d2..23d08336 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java -index 040509c1..0069bcc0 100644 +index f331a442..a977045d 100644 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java -@@ -11,7 +11,7 @@ public class ReloadCommand extends BukkitCommand { +@@ -13,7 +13,7 @@ public class ReloadCommand extends BukkitCommand { public ReloadCommand(String name) { super(name); this.description = "Reloads the server configuration and plugins"; @@ -82,7 +82,7 @@ index 040509c1..0069bcc0 100644 this.setPermission("bukkit.command.reload"); this.setAliases(Arrays.asList("rl")); } -@@ -28,6 +28,13 @@ public class ReloadCommand extends BukkitCommand { +@@ -30,6 +30,13 @@ public class ReloadCommand extends BukkitCommand { Bukkit.getServer().reloadPermissions(); Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Permissions successfully reloaded."); return true; @@ -97,5 +97,5 @@ index 040509c1..0069bcc0 100644 confirmed = true; } else { -- -2.14.3 +2.14.1 diff --git a/Spigot-API-Patches/0065-Make-plugins-list-alphabetical.patch b/Spigot-API-Patches/0065-Make-plugins-list-alphabetical.patch index 311cb4ddd0..0610711134 100644 --- a/Spigot-API-Patches/0065-Make-plugins-list-alphabetical.patch +++ b/Spigot-API-Patches/0065-Make-plugins-list-alphabetical.patch @@ -1,23 +1,23 @@ -From 662bd9bbf378ed4d06831c1e4de040ea3282ce3e Mon Sep 17 00:00:00 2001 +From eb6be9c2f7b8605aa86bf14cc297ef8db064922e Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 02:08:55 -0500 Subject: [PATCH] Make /plugins list alphabetical diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java -index e21d1679..e2274fa2 100644 +index e40b03a7..b1d384e8 100644 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java -@@ -1,6 +1,8 @@ - package org.bukkit.command.defaults; - +@@ -3,6 +3,8 @@ package org.bukkit.command.defaults; import java.util.Arrays; + import java.util.Collections; + import java.util.List; +import java.util.Map; +import java.util.TreeMap; import org.bukkit.Bukkit; import org.bukkit.ChatColor; -@@ -25,20 +27,25 @@ public class PluginsCommand extends BukkitCommand { +@@ -32,19 +34,24 @@ public class PluginsCommand extends BukkitCommand { } private String getPluginList() { @@ -48,8 +48,7 @@ index e21d1679..e2274fa2 100644 + return "(" + plugins.size() + "): " + pluginList.toString(); + // Paper end } - - // Spigot Start + } -- 2.14.1 diff --git a/work/Bukkit b/work/Bukkit index 100ab9f2dc..ebed1f62a8 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 100ab9f2dc90cb717ab9a8c61e555a6618eccdb8 +Subproject commit ebed1f62a85a6fcd643de6cbb1a26489f9ed67aa diff --git a/work/CraftBukkit b/work/CraftBukkit index 326c2e605f..61e0c69d5f 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 326c2e605ff591232c7f3372299cddaa1513dd9b +Subproject commit 61e0c69d5ff5b20f0d375c6d1c497efddfc7f3de diff --git a/work/Spigot b/work/Spigot index 95dd097033..d21162c022 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 95dd09703307e923ccd31aeb1e5744c01df2a1b7 +Subproject commit d21162c022608caa31619b4d2ead39e808947df9