From f141bae102364d66f76d1b5f04bdb07bb3d3e49d Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Fri, 10 Nov 2017 17:31:39 -0500
Subject: [PATCH] Update B/CB/S

---
 ...nd-to-reload-permissions.yml-and-require-co.patch | 12 ++++++------
 .../Allow-Reloading-of-Command-Aliases.patch         |  2 +-
 .../Make-plugins-list-alphabetical.patch             | 11 +++++------
 work/Bukkit                                          |  2 +-
 work/CraftBukkit                                     |  2 +-
 work/Spigot                                          |  2 +-
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Spigot-API-Patches/Add-command-to-reload-permissions.yml-and-require-co.patch b/Spigot-API-Patches/Add-command-to-reload-permissions.yml-and-require-co.patch
index a5ee10174a..968f8bfc96 100644
--- a/Spigot-API-Patches/Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/Spigot-API-Patches/Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -35,7 +35,7 @@ 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
 @@ -0,0 +0,0 @@ public class ReloadCommand extends BukkitCommand {
@@ -77,14 +77,14 @@ index c70d5129..040509c1 100644
          Command.broadcastCommandMessage(sender, ChatColor.RED + "If you encounter any issues please use the /stop command to restart your server.");
          Bukkit.reload();
 @@ -0,0 +0,0 @@ public class ReloadCommand extends BukkitCommand {
+     }
+ 
      @Override
-     public java.util.List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException
-     {
--        return java.util.Collections.emptyList();
+-    public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
+-        return Collections.emptyList();
++    public java.util.List<String> 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
diff --git a/Spigot-API-Patches/Allow-Reloading-of-Command-Aliases.patch b/Spigot-API-Patches/Allow-Reloading-of-Command-Aliases.patch
index 9bad0119e5..ca6710270b 100644
--- a/Spigot-API-Patches/Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-API-Patches/Allow-Reloading-of-Command-Aliases.patch
@@ -70,7 +70,7 @@ 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
 @@ -0,0 +0,0 @@ public class ReloadCommand extends BukkitCommand {
diff --git a/Spigot-API-Patches/Make-plugins-list-alphabetical.patch b/Spigot-API-Patches/Make-plugins-list-alphabetical.patch
index 80e80f0d82..441b749303 100644
--- a/Spigot-API-Patches/Make-plugins-list-alphabetical.patch
+++ b/Spigot-API-Patches/Make-plugins-list-alphabetical.patch
@@ -5,13 +5,13 @@ 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
-@@ -0,0 +0,0 @@
- package org.bukkit.command.defaults;
- 
+@@ -0,0 +0,0 @@ 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;
  
@@ -48,6 +48,5 @@ index e21d1679..e2274fa2 100644
 +        return "(" + plugins.size() + "): " + pluginList.toString();
 +        // Paper end
      }
- 
-     // Spigot Start
+ }
 --
\ No newline at end of file
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