Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appears to apply and compile correctly. This update has only been PARTIALLY tested by PaperMC and as with ANY update, please do your own testing I've tested basic region file saving as well as our oversized chunks approach. Bukkit Changes: e167e549 Clarify MerchantInventory#getSelectedRecipe. 3a1d5b8f Apply default permissions by registration order. c64cc93f Make tags Keyed ec037ed7 Added a method to get a list of tags bfb6ef86 Introduce rotation methods to the Vector class fc727372 Remove draft API from FluidLevelChangeEvent CraftBukkit Changes: 6430d9c0 SPIGOT-4632: BlockState location is not fixed 14cd1688 Fix CraftInventoryMerchant#getSelectedRecipe if there is no active merchant recipe. c24abab7 Load custom permissions after default permissions. bc99dfe8 Make tags Keyed 6fce004f Added a method to get a list of tags Spigot Changes: e5e5c7c6 Allow Saving Large Chunks e8d3881c Rebuild patches
2019-02-21 22:41:20 -05:00 · 2019-02-21 22:41:20 -05:00 · 13d1abf01e
commit 13d1abf01e
parent 825191f069
28 changed files with 394 additions and 348 deletions
--- a/Spigot-API-Patches/0003-Timings-v2.patch
+++ b/Spigot-API-Patches/0003-Timings-v2.patch
@ -1,4 +1,4 @@
-From 92f2c6e98e370ef4bc1f110e8eb7a85dc11eaac9 Mon Sep 17 00:00:00 2001
+From c4e6bfe0af9a90f66cf6685af9e00d904a817b2d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2

 diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java
 new file mode 100644
-index 000000000..98079dc0c
+index 00000000..98079dc0
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java
@@ -0,0 +1,82 @@
@ -94,7 +94,7 @@ index 000000000..98079dc0c
 +}
 diff --git a/src/main/java/co/aikar/timings/NullTimingHandler.java b/src/main/java/co/aikar/timings/NullTimingHandler.java
 new file mode 100644
-index 000000000..8c43e2061
+index 00000000..8c43e206
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/NullTimingHandler.java
@@ -0,0 +1,61 @@
@ -161,7 +161,7 @@ index 000000000..8c43e2061
 +}
 diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java
 new file mode 100644
-index 000000000..feddcdbd4
+index 00000000..feddcdbd
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
@@ -0,0 +1,81 @@
@ -248,7 +248,7 @@ index 000000000..feddcdbd4
 +}
 diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java
 new file mode 100644
-index 000000000..b2260104c
+index 00000000..b2260104
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/Timing.java
@@ -0,0 +1,76 @@
@ -330,7 +330,7 @@ index 000000000..b2260104c
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingData.java b/src/main/java/co/aikar/timings/TimingData.java
 new file mode 100644
-index 000000000..f222d6b7d
+index 00000000..f222d6b7
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingData.java
@@ -0,0 +1,120 @@
@ -456,7 +456,7 @@ index 000000000..f222d6b7d
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingHandler.java b/src/main/java/co/aikar/timings/TimingHandler.java
 new file mode 100644
-index 000000000..521c985e6
+index 00000000..521c985e
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHandler.java
@@ -0,0 +1,200 @@
@ -662,7 +662,7 @@ index 000000000..521c985e6
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
 new file mode 100644
-index 000000000..28d0954a3
+index 00000000..28d0954a
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHistory.java
@@ -0,0 +1,345 @@
@ -1013,7 +1013,7 @@ index 000000000..28d0954a3
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingHistoryEntry.java b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
 new file mode 100644
-index 000000000..0e114eb32
+index 00000000..0e114eb3
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
@@ -0,0 +1,55 @@
@ -1074,7 +1074,7 @@ index 000000000..0e114eb32
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingIdentifier.java b/src/main/java/co/aikar/timings/TimingIdentifier.java
 new file mode 100644
-index 000000000..a7f1f44d7
+index 00000000..a7f1f44d
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingIdentifier.java
@@ -0,0 +1,106 @@
@ -1186,7 +1186,7 @@ index 000000000..a7f1f44d7
 +}
 diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
 new file mode 100644
-index 000000000..f907649ba
+index 00000000..f907649b
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/Timings.java
@@ -0,0 +1,284 @@
@ -1476,7 +1476,7 @@ index 000000000..f907649ba
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
 new file mode 100644
-index 000000000..56b10e898
+index 00000000..56b10e89
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsCommand.java
@@ -0,0 +1,119 @@
@ -1601,7 +1601,7 @@ index 000000000..56b10e898
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
 new file mode 100644
-index 000000000..df7f42595
+index 00000000..df7f4259
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -0,0 +1,342 @@
@ -1949,7 +1949,7 @@ index 000000000..df7f42595
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsManager.java b/src/main/java/co/aikar/timings/TimingsManager.java
 new file mode 100644
-index 000000000..f63e7033c
+index 00000000..f63e7033
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsManager.java
@@ -0,0 +1,187 @@
@ -2142,7 +2142,7 @@ index 000000000..f63e7033c
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsReportListener.java b/src/main/java/co/aikar/timings/TimingsReportListener.java
 new file mode 100644
-index 000000000..e7c389c05
+index 00000000..e7c389c0
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsReportListener.java
@@ -0,0 +1,72 @@
@ -2220,7 +2220,7 @@ index 000000000..e7c389c05
 +}
 diff --git a/src/main/java/co/aikar/timings/UnsafeTimingHandler.java b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
 new file mode 100644
-index 000000000..5edaba128
+index 00000000..5edaba12
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
@@ -0,0 +1,51 @@
@ -2277,7 +2277,7 @@ index 000000000..5edaba128
 +}
 diff --git a/src/main/java/co/aikar/util/Counter.java b/src/main/java/co/aikar/util/Counter.java
 new file mode 100644
-index 000000000..23ac07f2c
+index 00000000..23ac07f2
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/Counter.java
@@ -0,0 +1,35 @@
@ -2318,7 +2318,7 @@ index 000000000..23ac07f2c
 +}
 diff --git a/src/main/java/co/aikar/util/JSONUtil.java b/src/main/java/co/aikar/util/JSONUtil.java
 new file mode 100644
-index 000000000..962749750
+index 00000000..96274975
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/JSONUtil.java
@@ -0,0 +1,129 @@
@ -2453,7 +2453,7 @@ index 000000000..962749750
 +}
 diff --git a/src/main/java/co/aikar/util/LoadingIntMap.java b/src/main/java/co/aikar/util/LoadingIntMap.java
 new file mode 100644
-index 000000000..24eae4bea
+index 00000000..24eae4be
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/LoadingIntMap.java
@@ -0,0 +1,71 @@
@ -2530,7 +2530,7 @@ index 000000000..24eae4bea
 +}
 diff --git a/src/main/java/co/aikar/util/LoadingMap.java b/src/main/java/co/aikar/util/LoadingMap.java
 new file mode 100644
-index 000000000..9a4f9dca8
+index 00000000..9a4f9dca
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/LoadingMap.java
@@ -0,0 +1,339 @@
@ -2875,7 +2875,7 @@ index 000000000..9a4f9dca8
 +}
 diff --git a/src/main/java/co/aikar/util/MRUMapCache.java b/src/main/java/co/aikar/util/MRUMapCache.java
 new file mode 100644
-index 000000000..df592d855
+index 00000000..df592d85
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/MRUMapCache.java
@@ -0,0 +1,102 @@
@ -2982,7 +2982,7 @@ index 000000000..df592d855
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 58f3efe09..38e629193 100644
+index d8014f14..14e425d1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -572,7 +572,6 @@ public final class Bukkit {
@ -2994,10 +2994,10 @@ index 58f3efe09..38e629193 100644
 
     /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 23e7e4173..e2ac40dcb 100644
+index fac90a48..9d2326ca 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1178,12 +1178,27 @@ public interface Server extends PluginMessageRecipient {
+@@ -1193,12 +1193,27 @@ public interface Server extends PluginMessageRecipient {
     // Spigot start
     public class Spigot
     {
@ -3028,7 +3028,7 @@ index 23e7e4173..e2ac40dcb 100644
          *
 diff --git a/src/main/java/org/bukkit/command/BufferedCommandSender.java b/src/main/java/org/bukkit/command/BufferedCommandSender.java
 new file mode 100644
-index 000000000..fd452bce4
+index 00000000..fd452bce
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/BufferedCommandSender.java
@@ -0,0 +1,18 @@
@ -3051,7 +3051,7 @@ index 000000000..fd452bce4
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 33e8681d6..db7f44289 100644
+index 33e8681d..db7f4428 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
@@ -33,7 +33,8 @@ public abstract class Command {
@ -3081,7 +3081,7 @@ index 33e8681d6..db7f44289 100644
             return true;
         }
 diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
-index 502578837..9c80f4640 100644
+index 50257883..9c80f464 100644
 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
@@ -9,6 +9,7 @@ public class FormattedCommandAlias extends Command {
@ -3104,7 +3104,7 @@ index 502578837..9c80f4640 100644
     }
 diff --git a/src/main/java/org/bukkit/command/MessageCommandSender.java b/src/main/java/org/bukkit/command/MessageCommandSender.java
 new file mode 100644
-index 000000000..5527e7c86
+index 00000000..5527e7c8
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/MessageCommandSender.java
@@ -0,0 +1,105 @@
@ -3214,7 +3214,7 @@ index 000000000..5527e7c86
 +
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index d9183db2f..43e52a77a 100644
+index d9183db2..43e52a77 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -29,7 +29,7 @@ public class SimpleCommandMap implements CommandMap {
@ -3249,7 +3249,7 @@ index d9183db2f..43e52a77a 100644
             // Note: we don't return the result of target.execute as thats success / failure, we return handled (true) or not handled (false)
 diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 deleted file mode 100644
-index bba914d7f..000000000
+index bba914d7..00000000
 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 +++ /dev/null
@@ -1,253 +0,0 @@
@ -3507,7 +3507,7 @@ index bba914d7f..000000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 71fe947bc..75f21146c 100644
+index 71fe947b..75f21146 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1551,6 +1551,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@ -3523,10 +3523,10 @@ index 71fe947bc..75f21146c 100644
 
     @Override
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 8b130abb7..80c152ba9 100644
+index 92db0663..0185934b 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -293,7 +293,6 @@ public final class SimplePluginManager implements PluginManager {
+@@ -294,7 +294,6 @@ public final class SimplePluginManager implements PluginManager {
             }
         }
 
@ -3534,7 +3534,7 @@ index 8b130abb7..80c152ba9 100644
         return result.toArray(new Plugin[result.size()]);
     }
 
-@@ -330,7 +329,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -331,7 +330,7 @@ public final class SimplePluginManager implements PluginManager {
 
         if (result != null) {
             plugins.add(result);
@ -3543,7 +3543,7 @@ index 8b130abb7..80c152ba9 100644
         }
 
         return result;
-@@ -356,7 +355,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -357,7 +356,7 @@ public final class SimplePluginManager implements PluginManager {
      * @return Plugin if it exists, otherwise null
      */
     public synchronized Plugin getPlugin(String name) {
@ -3552,7 +3552,7 @@ index 8b130abb7..80c152ba9 100644
     }
 
     public synchronized Plugin[] getPlugins() {
-@@ -554,7 +553,8 @@ public final class SimplePluginManager implements PluginManager {
+@@ -555,7 +554,8 @@ public final class SimplePluginManager implements PluginManager {
             throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
         }
 
@ -3562,7 +3562,7 @@ index 8b130abb7..80c152ba9 100644
             getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
         } else {
             getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
-@@ -730,7 +730,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -731,7 +731,7 @@ public final class SimplePluginManager implements PluginManager {
     }
 
     public boolean useTimings() {
@ -3571,7 +3571,7 @@ index 8b130abb7..80c152ba9 100644
     }
 
     /**
-@@ -739,6 +739,6 @@ public final class SimplePluginManager implements PluginManager {
+@@ -740,6 +740,6 @@ public final class SimplePluginManager implements PluginManager {
      * @param use True if per event timing code should be used
      */
     public void useTimings(boolean use) {
@ -3580,7 +3580,7 @@ index 8b130abb7..80c152ba9 100644
     }
 }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 2d4c75ab2..545945468 100644
+index 2d4c75ab..54594546 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -41,7 +41,6 @@ import org.bukkit.plugin.PluginLoader;
@ -3629,7 +3629,7 @@ index 2d4c75ab2..545945468 100644
                 eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
             } else {
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 7a8abe75a..bc33ff33a 100644
+index 7a8abe75..bc33ff33 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -23,7 +23,8 @@ import org.bukkit.plugin.PluginDescriptionFile;
@ -3643,7 +3643,7 @@ index 7a8abe75a..bc33ff33a 100644
     private final Map<String, Class<?>> classes = new ConcurrentHashMap<String, Class<?>>();
     private final PluginDescriptionFile description;
 diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java
-index 5ca863b36..048047067 100644
+index 5ca863b3..04804706 100644
 --- a/src/main/java/org/bukkit/util/CachedServerIcon.java
 +++ b/src/main/java/org/bukkit/util/CachedServerIcon.java
@@ -12,4 +12,6 @@ import org.bukkit.event.server.ServerListPingEvent;
@ -3655,7 +3655,7 @@ index 5ca863b36..048047067 100644
 +    public String getData(); // Spigot
 +}
 diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java
-index 8d982974e..e9f76006e 100644
+index 8d982974..e9f76006 100644
 --- a/src/main/java/org/spigotmc/CustomTimingsHandler.java
 +++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java
@@ -1,165 +1,105 @@
--- a/Spigot-API-Patches/0013-Expose-server-CommandMap.patch
+++ b/Spigot-API-Patches/0013-Expose-server-CommandMap.patch
@ -1,14 +1,14 @@
-From 06f6137e4b84d9d2a2e29b74cc652e0d66845d3a Mon Sep 17 00:00:00 2001
+From 1aea2e6ad04b50f18e972f4b30a3f2855b6108eb Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Mon, 29 Feb 2016 19:48:59 -0600
 Subject: [PATCH] Expose server CommandMap


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index e1ce29328..e4d945830 100644
+index 6055c801..cb7dc068 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1420,6 +1420,17 @@ public final class Bukkit {
+@@ -1437,6 +1437,17 @@ public final class Bukkit {
         return server.getUnsafe();
     }
 
@ -27,7 +27,7 @@ index e1ce29328..e4d945830 100644
     {
         return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index fea2ad6f4..29e3feb1e 100644
+index 1632af18..c4dc1de2 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -1065,6 +1065,14 @@ public interface Server extends PluginMessageRecipient {
--- a/Spigot-API-Patches/0016-Add-exception-reporting-event.patch
+++ b/Spigot-API-Patches/0016-Add-exception-reporting-event.patch
@ -1,4 +1,4 @@
-From 46d9ff00a27f92c65eb4d40037300c5f3fbc394c Mon Sep 17 00:00:00 2001
+From 89163d1e8bdffcb4edd56ad2285ce58bf5852f01 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 20:24:35 -0600
 Subject: [PATCH] Add exception reporting event
@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event

 diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
 new file mode 100644
-index 000000000..4109454a3
+index 00000000..4109454a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
@@ -0,0 +1,37 @@
@ -49,7 +49,7 @@ index 000000000..4109454a3
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
 new file mode 100644
-index 000000000..6fb39af04
+index 00000000..6fb39af0
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
@@ -0,0 +1,64 @@
@ -119,7 +119,7 @@ index 000000000..6fb39af04
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
 new file mode 100644
-index 000000000..410b24139
+index 00000000..410b2413
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
@@ -0,0 +1,52 @@
@ -177,7 +177,7 @@ index 000000000..410b24139
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerException.java
 new file mode 100644
-index 000000000..c06ea3942
+index 00000000..c06ea394
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerException.java
@@ -0,0 +1,23 @@
@ -206,7 +206,7 @@ index 000000000..c06ea3942
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
 new file mode 100644
-index 000000000..e762ed0db
+index 00000000..e762ed0d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
@@ -0,0 +1,35 @@
@ -247,7 +247,7 @@ index 000000000..e762ed0db
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
 new file mode 100644
-index 000000000..f016ba3b1
+index 00000000..f016ba3b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
@@ -0,0 +1,20 @@
@ -274,7 +274,7 @@ index 000000000..f016ba3b1
 \ No newline at end of file
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
 new file mode 100644
-index 000000000..6defac287
+index 00000000..6defac28
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
@@ -0,0 +1,38 @@
@ -318,7 +318,7 @@ index 000000000..6defac287
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
 new file mode 100644
-index 000000000..89e132525
+index 00000000..89e13252
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
@@ -0,0 +1,64 @@
@ -388,7 +388,7 @@ index 000000000..89e132525
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
 new file mode 100644
-index 000000000..2d0b2d4a9
+index 00000000..2d0b2d4a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
@@ -0,0 +1,37 @@
@ -431,7 +431,7 @@ index 000000000..2d0b2d4a9
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
 new file mode 100644
-index 000000000..5582999fe
+index 00000000..5582999f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
@@ -0,0 +1,22 @@
@ -458,7 +458,7 @@ index 000000000..5582999fe
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 43e52a77a..65ad78c48 100644
+index 43e52a77..65ad78c4 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -9,6 +9,9 @@ import java.util.Iterator;
@ -499,10 +499,10 @@ index 43e52a77a..65ad78c48 100644
     }
 
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 80c152ba9..b88f31ca2 100644
+index 0185934b..b7627e39 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -18,6 +18,9 @@ import java.util.logging.Level;
+@@ -19,6 +19,9 @@ import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@ -512,7 +512,7 @@ index 80c152ba9..b88f31ca2 100644
 import org.apache.commons.lang.Validate;
 import org.bukkit.Server;
 import org.bukkit.command.Command;
-@@ -401,7 +404,8 @@ public final class SimplePluginManager implements PluginManager {
+@@ -402,7 +405,8 @@ public final class SimplePluginManager implements PluginManager {
             try {
                 plugin.getPluginLoader().enablePlugin(plugin);
             } catch (Throwable ex) {
@ -522,7 +522,7 @@ index 80c152ba9..b88f31ca2 100644
             }
 
             HandlerList.bakeAll();
-@@ -420,36 +424,48 @@ public final class SimplePluginManager implements PluginManager {
+@@ -421,36 +425,48 @@ public final class SimplePluginManager implements PluginManager {
             try {
                 plugin.getPluginLoader().disablePlugin(plugin);
             } catch (Throwable ex) {
@ -576,7 +576,7 @@ index 80c152ba9..b88f31ca2 100644
     public void clearPlugins() {
         synchronized (this) {
             disablePlugins();
-@@ -511,7 +527,13 @@ public final class SimplePluginManager implements PluginManager {
+@@ -512,7 +528,13 @@ public final class SimplePluginManager implements PluginManager {
                             ));
                 }
             } catch (Throwable ex) {
@ -592,5 +592,5 @@ index 80c152ba9..b88f31ca2 100644
         }
     }
 -- 
-2.19.1
+2.20.1

--- a/Spigot-API-Patches/0024-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/Spigot-API-Patches/0024-Add-command-to-reload-permissions.yml-and-require-co.patch
@ -1,4 +1,4 @@
-From 143887eadf9d0909f4093ef48ef2207f67a07389 Mon Sep 17 00:00:00 2001
+From 04ea5b0483635c527ce9f0c79508b1f173e020c8 Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:28:07 -0400
 Subject: [PATCH] Add command to reload permissions.yml and require confirm to
@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index e38b16c2b..e1704ae2a 100644
+index 22704949..2d588c6b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1449,6 +1449,13 @@ public final class Bukkit {
+@@ -1466,6 +1466,13 @@ public final class Bukkit {
     public static org.bukkit.command.CommandMap getCommandMap() {
         return server.getCommandMap();
     }
@ -24,10 +24,10 @@ index e38b16c2b..e1704ae2a 100644
 
     public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index dee814eed..89f68d58e 100644
+index f4f4f291..18e5dd48 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1264,4 +1264,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1279,4 +1279,6 @@ public interface Server extends PluginMessageRecipient {
 
     Spigot spigot();
     // Spigot end
@ -35,7 +35,7 @@ index dee814eed..89f68d58e 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 0ab7e295d..f331a4423 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
@@ -13,15 +13,36 @@ public class ReloadCommand extends BukkitCommand {
@ -87,10 +87,10 @@ index 0ab7e295d..f331a4423 100644
     }
 }
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index b88f31ca2..bd0588a20 100644
+index b7627e39..5034215a 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -763,4 +763,13 @@ public final class SimplePluginManager implements PluginManager {
+@@ -764,4 +764,13 @@ public final class SimplePluginManager implements PluginManager {
     public void useTimings(boolean use) {
         co.aikar.timings.Timings.setTimingsEnabled(use); // Spigot
     }
--- a/Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch
@ -1,4 +1,4 @@
-From 91f8d92c9957a90a8f35f0459b3775b7e592b4ba Mon Sep 17 00:00:00 2001
+From 305f8749b7972506665be9ad41cdaa5fb020e60f Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:16:39 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml

 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index e1704ae2a..a312a662b 100644
+index 2d588c6b..5715057a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1456,6 +1456,15 @@ public final class Bukkit {
+@@ -1473,6 +1473,15 @@ public final class Bukkit {
     public static void reloadPermissions() {
         server.reloadPermissions();
     }
@ -26,10 +26,10 @@ index e1704ae2a..a312a662b 100644
 
     public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 89f68d58e..a03591829 100644
+index 18e5dd48..259a0fbe 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1266,4 +1266,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1281,4 +1281,6 @@ public interface Server extends PluginMessageRecipient {
     // Spigot end
 
     void reloadPermissions(); // Paper
@ -37,7 +37,7 @@ index 89f68d58e..a03591829 100644
 +    boolean reloadCommandAliases(); // Paper
 }
 diff --git a/src/main/java/org/bukkit/command/CommandMap.java b/src/main/java/org/bukkit/command/CommandMap.java
-index 30d60247e..938959aa5 100644
+index 30d60247..938959aa 100644
 --- a/src/main/java/org/bukkit/command/CommandMap.java
 +++ b/src/main/java/org/bukkit/command/CommandMap.java
@@ -123,4 +123,13 @@ public interface CommandMap {
@ -55,7 +55,7 @@ index 30d60247e..938959aa5 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 65ad78c48..41e95692e 100644
+index 65ad78c4..41e95692 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -279,4 +279,10 @@ public class SimpleCommandMap implements CommandMap {
@ -70,7 +70,7 @@ index 65ad78c48..41e95692e 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 f331a4423..a977045de 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
@@ -13,7 +13,7 @@ public class ReloadCommand extends BukkitCommand {
--- a/Spigot-API-Patches/0049-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-API-Patches/0049-Add-configuration-option-to-prevent-player-names-fro.patch
@ -1,4 +1,4 @@
-From 33948f129f2c80ab0d7cc19602b603be14e730f3 Mon Sep 17 00:00:00 2001
+From d34bbb981986fda1507431108f1c315cdfd1c91d Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:24 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a312a662b..41cd3dba2 100644
+index 5715057a..eb180374 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1465,6 +1465,16 @@ public final class Bukkit {
+@@ -1482,6 +1482,16 @@ public final class Bukkit {
     public static boolean reloadCommandAliases() {
         return server.reloadCommandAliases();
     }
@ -27,10 +27,10 @@ index a312a662b..41cd3dba2 100644
 
     public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index a03591829..46502ede1 100644
+index 259a0fbe..c57f81fd 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1268,4 +1268,14 @@ public interface Server extends PluginMessageRecipient {
+@@ -1283,4 +1283,14 @@ public interface Server extends PluginMessageRecipient {
     void reloadPermissions(); // Paper
 
     boolean reloadCommandAliases(); // Paper
@ -46,7 +46,7 @@ index a03591829..46502ede1 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java
-index 2abe1208f..c660c178c 100644
+index 2abe1208..c660c178 100644
 --- a/src/main/java/org/bukkit/command/PluginCommand.java
 +++ b/src/main/java/org/bukkit/command/PluginCommand.java
@@ -145,6 +145,7 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo
--- a/Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch
+++ b/Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch
@ -1,4 +1,4 @@
-From ce7a08b7515e5720254f32939db266a4df6d908b Mon Sep 17 00:00:00 2001
+From ba7ca826a69db5f365c35ebf7ea2f7834f8aaa7e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 15 Jan 2018 21:46:46 -0500
 Subject: [PATCH] Basic PlayerProfile API
@ -7,7 +7,7 @@ Provides basic elements of a PlayerProfile to be used by future API/events

 diff --git a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
 new file mode 100644
-index 000000000..529c53760
+index 00000000..529c5376
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
@@ -0,0 +1,142 @@
@ -155,7 +155,7 @@ index 000000000..529c53760
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
 new file mode 100644
-index 000000000..d17061e66
+index 00000000..d17061e6
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
@@ -0,0 +1,72 @@
@ -232,7 +232,7 @@ index 000000000..d17061e66
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 41cd3dba2..f13d80cf2 100644
+index eb180374..75634a8d 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -51,6 +51,9 @@ import org.bukkit.generator.ChunkGenerator;
@ -245,7 +245,7 @@ index 41cd3dba2..f13d80cf2 100644
 /**
  * Represents the Bukkit core, for version and Server singleton handling
  */
-@@ -1475,6 +1478,37 @@ public final class Bukkit {
+@@ -1492,6 +1495,37 @@ public final class Bukkit {
     public static boolean suggestPlayerNamesWhenNullTabCompletions() {
         return server.suggestPlayerNamesWhenNullTabCompletions();
     }
@ -284,7 +284,7 @@ index 41cd3dba2..f13d80cf2 100644
 
     public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 46502ede1..198107081 100644
+index c57f81fd..1d1f7784 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -52,6 +52,9 @@ import org.bukkit.generator.ChunkGenerator;
@ -297,7 +297,7 @@ index 46502ede1..198107081 100644
 /**
  * Represents a server implementation.
  */
-@@ -1277,5 +1280,30 @@ public interface Server extends PluginMessageRecipient {
+@@ -1292,5 +1295,30 @@ public interface Server extends PluginMessageRecipient {
      * @return true if player names should be suggested
      */
     boolean suggestPlayerNamesWhenNullTabCompletions();
--- a/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch
+++ b/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch
@ -1,4 +1,4 @@
-From c5d36c89c26360428075ecd830da4f65b2c2de11 Mon Sep 17 00:00:00 2001
+From 53b080c35566392e83fc231ce763897a0e9420a4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 21:33:35 -0400
 Subject: [PATCH] Close Plugin Class Loaders on Disable
@ -54,10 +54,10 @@ index e5638d56..b72d5a9b 100644
      * Gets a {@link Permission} from its fully qualified name
      *
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index bd0588a2..cb2b0b9c 100644
+index 5034215a..d925423d 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -412,17 +412,29 @@ public final class SimplePluginManager implements PluginManager {
+@@ -413,17 +413,29 @@ public final class SimplePluginManager implements PluginManager {
         }
     }
 
@ -90,7 +90,7 @@ index bd0588a2..cb2b0b9c 100644
             } catch (Throwable ex) {
                 handlePluginException("Error occurred (in the plugin loader) while disabling "
                         + plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin); // Paper
-@@ -468,7 +480,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -469,7 +481,7 @@ public final class SimplePluginManager implements PluginManager {
 
     public void clearPlugins() {
         synchronized (this) {
--- a/Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch
+++ b/Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch
@ -1,4 +1,4 @@
-From 48dba594ee0744d16cbcc43439e732d9eb97795b Mon Sep 17 00:00:00 2001
+From 0c1023b2f663801604199610c741023df370b001 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 9 Sep 2018 00:32:05 -0400
 Subject: [PATCH] Remove deadlock risk in firing async events
@ -16,10 +16,10 @@ which results in a hard crash.
 This change removes the synchronize and adds some protection around enable/disable

 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index cb2b0b9c..a7dd902f 100644
+index d925423d..59c70b8a 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -385,7 +385,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -386,7 +386,7 @@ public final class SimplePluginManager implements PluginManager {
      * @param plugin Plugin to check
      * @return true if the plugin is enabled, otherwise false
      */
@ -28,7 +28,7 @@ index cb2b0b9c..a7dd902f 100644
         if ((plugin != null) && (plugins.contains(plugin))) {
             return plugin.isEnabled();
         } else {
-@@ -393,7 +393,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -394,7 +394,7 @@ public final class SimplePluginManager implements PluginManager {
         }
     }
 
@ -37,7 +37,7 @@ index cb2b0b9c..a7dd902f 100644
         if (!plugin.isEnabled()) {
             List<Command> pluginCommands = PluginCommandYamlParser.parse(plugin);
 
-@@ -430,7 +430,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -431,7 +431,7 @@ public final class SimplePluginManager implements PluginManager {
         disablePlugin(plugin, false);
     }
 
@ -46,7 +46,7 @@ index cb2b0b9c..a7dd902f 100644
         // Paper end - close Classloader on disable
         if (plugin.isEnabled()) {
             try {
-@@ -490,6 +490,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -491,6 +491,7 @@ public final class SimplePluginManager implements PluginManager {
             defaultPerms.get(false).clear();
         }
     }
@ -54,7 +54,7 @@ index cb2b0b9c..a7dd902f 100644
 
     /**
      * Calls an event with the given details.
-@@ -499,22 +500,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -500,22 +501,7 @@ public final class SimplePluginManager implements PluginManager {
      * @param event Event details
      */
     public void callEvent(Event event) {
--- a/Spigot-API-Patches/0156-Add-Material-Tags.patch
+++ b/Spigot-API-Patches/0156-Add-Material-Tags.patch
@ -1,4 +1,4 @@
-From add76949997b755d73d123817b65e0551d58f6b3 Mon Sep 17 00:00:00 2001
+From 7f7f48e6093d4bfccc6d43de03db277d08870593 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 17 Jul 2018 01:27:15 -0400
 Subject: [PATCH] Add Material Tags
@ -8,10 +8,10 @@ are related to each other by a trait.

 diff --git a/src/main/java/com/destroystokyo/paper/MaterialSetTag.java b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java
 new file mode 100644
-index 00000000..b4f78e07
+index 00000000..b036c374
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java
-@@ -0,0 +1,139 @@
+@@ -0,0 +1,171 @@
 +/*
 + * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License
 + */
@ -21,6 +21,7 @@ index 00000000..b4f78e07
 +import com.google.common.collect.Lists;
 +import com.google.common.collect.Sets;
 +import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
 +import org.bukkit.Tag;
 +import org.bukkit.block.Block;
 +import org.bukkit.block.BlockState;
@ -35,18 +36,49 @@ index 00000000..b4f78e07
 +
 +public class MaterialSetTag implements Tag<Material> {
 +
+    private final NamespacedKey key;
 +    private final Set<Material> materials;
 +
+    /**
+     * @deprecated Use NamespacedKey version of constructor
+     */
+    @Deprecated
 +    public MaterialSetTag(Predicate<Material> filter) {
-+        this(Stream.of(Material.values()).filter(filter).collect(Collectors.toList()));
+        this(null, Stream.of(Material.values()).filter(filter).collect(Collectors.toList()));
 +    }
 +
+    /**
+     * @deprecated Use NamespacedKey version of constructor
+     */
+    @Deprecated
 +    public MaterialSetTag(Collection<Material> materials) {
+        this(null, materials);
+    }
+
+    /**
+     * @deprecated Use NamespacedKey version of constructor
+     */
+    @Deprecated
+    public MaterialSetTag(Material... materials) {
+        this(null, materials);
+    }
+
+    public MaterialSetTag(NamespacedKey key, Predicate<Material> filter) {
+        this(key, Stream.of(Material.values()).filter(filter).collect(Collectors.toList()));
+    }
+
+    public MaterialSetTag(NamespacedKey key, Material... materials) {
+        this(key, Lists.newArrayList(materials));
+    }
+
+    public MaterialSetTag(NamespacedKey key, Collection<Material> materials) {
+        this.key = key != null ? key : NamespacedKey.randomKey();
 +        this.materials = Sets.newEnumSet(materials, Material.class);
 +    }
 +
-+    public MaterialSetTag(Material... materials) {
-+        this.materials = Sets.newEnumSet(Lists.newArrayList(materials), Material.class);
+    @Override
+    public NamespacedKey getKey() {
+        return key;
 +    }
 +
 +    public MaterialSetTag add(Tag<Material>... tags) {
@ -153,10 +185,10 @@ index 00000000..b4f78e07
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java
 new file mode 100644
-index 00000000..7a48445d
+index 00000000..660191c2
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java
-@@ -0,0 +1,377 @@
+@@ -0,0 +1,382 @@
 +/*
 + * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License
 + *
@ -183,76 +215,81 @@ index 00000000..7a48445d
 +package com.destroystokyo.paper;
 +
 +import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
 +import org.bukkit.Tag;
 +
 +/**
 + * Represents a collection tags to identify materials that share common properties.
 + * Will map to minecraft for missing tags, as well as custom ones that may be useful.
 + */
-+@SuppressWarnings("NonFinalUtilityClass")
+@SuppressWarnings({"NonFinalUtilityClass", "unused", "WeakerAccess"})
 +public class MaterialTags {
 +
-+    public static final MaterialSetTag ARROWS = new MaterialSetTag()
+    private static NamespacedKey keyFor(String key) {
+        //noinspection deprecation
+        return new NamespacedKey("paper", key + "_settag");
+    }
+    public static final MaterialSetTag ARROWS = new MaterialSetTag(keyFor("arrows"))
 +        .endsWith("ARROW")
 +        .ensureSize("ARROWS", 3);
 +
 +    /**
 +     * Cover all 16 colors of beds.
 +     */
-+    public static final MaterialSetTag BEDS = new MaterialSetTag()
+    public static final MaterialSetTag BEDS = new MaterialSetTag(keyFor("beds"))
 +        .endsWith("_BED")
 +        .ensureSize("BEDS", 16);
 +
 +    /**
 +     * Covers all bucket items.
 +     */
-+    public static final MaterialSetTag BUCKETS = new MaterialSetTag()
+    public static final MaterialSetTag BUCKETS = new MaterialSetTag(keyFor("buckets"))
 +        .endsWith("BUCKET")
 +        .ensureSize("BUCKETS", 8);
 +
 +    /**
 +     * Covers coal and charcoal.
 +     */
-+    public static final MaterialSetTag COALS = new MaterialSetTag()
+    public static final MaterialSetTag COALS = new MaterialSetTag(keyFor("coals"))
 +        .add(Material.COAL, Material.CHARCOAL);
 +
 +    /**
 +     * Covers both cobblestone wall variants.
 +     */
-+    public static final MaterialSetTag COBBLESTONE_WALLS = new MaterialSetTag()
+    public static final MaterialSetTag COBBLESTONE_WALLS = new MaterialSetTag(keyFor("cobblestone_walls"))
 +        .endsWith("COBBLESTONE_WALL")
 +        .ensureSize("COBBLESTONE_WALLS", 2);
 +
 +    /**
 +     * Covers both cobblestone and mossy Cobblestone.
 +     */
-+    public static final MaterialSetTag COBBLESTONES = new MaterialSetTag()
+    public static final MaterialSetTag COBBLESTONES = new MaterialSetTag(keyFor("cobblestones"))
 +        .add(Material.COBBLESTONE, Material.MOSSY_COBBLESTONE);
 +
 +    /**
 +     * Covers all 16 colors of concrete.
 +     */
-+    public static final MaterialSetTag CONCRETES = new MaterialSetTag()
+    public static final MaterialSetTag CONCRETES = new MaterialSetTag(keyFor("concretes"))
 +        .endsWith("_CONCRETE")
 +        .ensureSize("CONCRETES", 16);
 +
 +    /**
 +     * Covers all 16 colors of concrete powder.
 +     */
-+    public static final MaterialSetTag CONCRETE_POWDER = new MaterialSetTag()
+    public static final MaterialSetTag CONCRETE_POWDER = new MaterialSetTag(keyFor("concrete_powder"))
 +        .endsWith("_CONCRETE_POWDER")
 +        .ensureSize("CONCRETE_POWDER", 16);
 +
 +    /**
 +     * Covers the two types of cooked fish.
 +     */
-+    public static final MaterialSetTag COOKED_FISH = new MaterialSetTag()
+    public static final MaterialSetTag COOKED_FISH = new MaterialSetTag(keyFor("cooked_fish"))
 +        .add(Material.COOKED_COD, Material.COOKED_SALMON);
 +
 +    /**
 +     * Covers all 16 dyes.
 +     */
-+    public static final MaterialSetTag DYES = new MaterialSetTag()
+    public static final MaterialSetTag DYES = new MaterialSetTag(keyFor("dyes"))
 +        .endsWith("_DYE")
 +        .add(Material.BONE_MEAL,
 +            Material.CACTUS_GREEN,
@ -267,27 +304,27 @@ index 00000000..7a48445d
 +    /**
 +     * Covers all 6 wood variants of gates.
 +     */
-+    public static final MaterialSetTag FENCE_GATES = new MaterialSetTag()
+    public static final MaterialSetTag FENCE_GATES = new MaterialSetTag(keyFor("fence_gates"))
 +        .endsWith("_GATE")
 +        .ensureSize("FENCE_GATES", 6);
 +
 +    /**
 +     * Covers all 6 wood variants and nether brick fence.
 +     */
-+    public static final MaterialSetTag FENCES = new MaterialSetTag()
+    public static final MaterialSetTag FENCES = new MaterialSetTag(keyFor("fences"))
 +        .endsWith("_FENCE")
 +        .ensureSize("FENCES", 7);
 +
 +    /**
 +     * Covers all 4 variants of fish buckets.
 +     */
-+    public static final MaterialSetTag FISH_BUCKETS = new MaterialSetTag()
+    public static final MaterialSetTag FISH_BUCKETS = new MaterialSetTag(keyFor("fish_buckets"))
 +        .add(Material.COD_BUCKET, Material.PUFFERFISH_BUCKET, Material.SALMON_BUCKET, Material.TROPICAL_FISH_BUCKET);
 +
 +    /**
 +     * Covers the non-colored glass and 16 stained glass (not panes).
 +     */
-+    public static final MaterialSetTag GLASS = new MaterialSetTag()
+    public static final MaterialSetTag GLASS = new MaterialSetTag(keyFor("glass"))
 +        .endsWith("_GLASS")
 +        .add(Material.GLASS)
 +        .ensureSize("GLASS", 17);
@ -295,21 +332,21 @@ index 00000000..7a48445d
 +    /**
 +     * Covers the non-colored glass panes and 16 stained glass panes (panes only).
 +     */
-+    public static final MaterialSetTag GLASS_PANES = new MaterialSetTag()
+    public static final MaterialSetTag GLASS_PANES = new MaterialSetTag(keyFor("glass_panes"))
 +        .endsWith("GLASS_PANE")
 +        .ensureSize("GLASS_PANES", 17);
 +
 +    /**
 +     * Covers all 16 glazed terracotta blocks.
 +     */
-+    public static final MaterialSetTag GLAZED_TERRACOTTA = new MaterialSetTag()
+    public static final MaterialSetTag GLAZED_TERRACOTTA = new MaterialSetTag(keyFor("glazed_terracotta"))
 +        .endsWith("GLAZED_TERRACOTTA")
 +        .ensureSize("GLAZED_TERRACOTTA", 16);
 +
 +    /**
 +     * Covers the 16 colors of stained terracotta.
 +     */
-+    public static final MaterialSetTag STAINED_TERRACOTTA = new MaterialSetTag()
+    public static final MaterialSetTag STAINED_TERRACOTTA = new MaterialSetTag(keyFor("stained_terracotta"))
 +        .endsWith("TERRACOTTA")
 +        .not(Material.TERRACOTTA)
 +        .notEndsWith("GLAZED_TERRACOTTA")
@ -318,7 +355,7 @@ index 00000000..7a48445d
 +    /**
 +     * Covers terracotta along with the 16 stained variants.
 +     */
-+    public static final MaterialSetTag TERRACOTTA = new MaterialSetTag()
+    public static final MaterialSetTag TERRACOTTA = new MaterialSetTag(keyFor("terracotta"))
 +        .endsWith("TERRACOTTA")
 +        .ensureSize("TERRACOTTA", 33);
 +
@ -326,28 +363,28 @@ index 00000000..7a48445d
 +    /**
 +     * Covers both golden apples.
 +     */
-+    public static final MaterialSetTag GOLDEN_APPLES = new MaterialSetTag()
+    public static final MaterialSetTag GOLDEN_APPLES = new MaterialSetTag(keyFor("golden_apples"))
 +        .endsWith("GOLDEN_APPLE")
 +        .ensureSize("GOLDEN_APPLES", 2);
 +
 +    /**
 +     * Covers the 3 variants of horse armor.
 +     */
-+    public static final MaterialSetTag HORSE_ARMORS = new MaterialSetTag()
+    public static final MaterialSetTag HORSE_ARMORS = new MaterialSetTag(keyFor("horse_armors"))
 +        .endsWith("_HORSE_ARMOR")
 +        .ensureSize("HORSE_ARMORS", 3);
 +
 +    /**
 +     * Covers the 6 variants of infested blocks.
 +     */
-+    public static final MaterialSetTag INFESTED_BLOCKS = new MaterialSetTag()
+    public static final MaterialSetTag INFESTED_BLOCKS = new MaterialSetTag(keyFor("infested_blocks"))
 +        .startsWith("INFESTED_")
 +        .ensureSize("INFESTED_BLOCKS", 6);
 +
 +    /**
 +     * Covers the 3 variants of mushroom blocks.
 +     */
-+    public static final MaterialSetTag MUSHROOM_BLOCKS = new MaterialSetTag()
+    public static final MaterialSetTag MUSHROOM_BLOCKS = new MaterialSetTag(keyFor("mushroom_blocks"))
 +        .endsWith("MUSHROOM_BLOCK")
 +        .add(Material.MUSHROOM_STEM)
 +        .ensureSize("MUSHROOM_BLOCKS", 3);
@ -355,111 +392,111 @@ index 00000000..7a48445d
 +    /**
 +     * Covers both mushrooms.
 +     */
-+    public static final MaterialSetTag MUSHROOMS = new MaterialSetTag()
+    public static final MaterialSetTag MUSHROOMS = new MaterialSetTag(keyFor("mushrooms"))
 +        .add(Material.BROWN_MUSHROOM, Material.RED_MUSHROOM);
 +
 +    /**
 +     * Covers all 12 music disc items.
 +     */
-+    public static final MaterialSetTag MUSIC_DISCS = new MaterialSetTag()
+    public static final MaterialSetTag MUSIC_DISCS = new MaterialSetTag(keyFor("music_discs"))
 +        .startsWith("MUSIC_DISC_")
 +        .ensureSize("MUSIC_DISCS", 12);
 +
 +    /**
 +     * Covers all 8 ores.
 +     */
-+    public static final MaterialSetTag ORES = new MaterialSetTag()
+    public static final MaterialSetTag ORES = new MaterialSetTag(keyFor("ores"))
 +        .endsWith("_ORE")
 +        .ensureSize("ORES", 8);
 +
 +    /**
 +     * Covers all piston typed items and blocks including the piston head and moving piston.
 +     */
-+    public static final MaterialSetTag PISTONS = new MaterialSetTag()
+    public static final MaterialSetTag PISTONS = new MaterialSetTag(keyFor("pistons"))
 +        .contains("PISTON")
 +        .ensureSize("PISTONS", 4);
 +
 +    /**
 +     * Covers all potato items.
 +     */
-+    public static final MaterialSetTag POTATOES = new MaterialSetTag()
+    public static final MaterialSetTag POTATOES = new MaterialSetTag(keyFor("potatoes"))
 +        .endsWith("POTATO")
 +        .ensureSize("POTATOES", 3);
 +
 +    /**
 +     * Covers all 6 wooden pressure plates and the 2 weighted pressure plates and 1 stone pressure plate.
 +     */
-+    public static final MaterialSetTag PRESSURE_PLATES = new MaterialSetTag()
+    public static final MaterialSetTag PRESSURE_PLATES = new MaterialSetTag(keyFor("pressure_plates"))
 +        .endsWith("_PRESSURE_PLATE")
 +        .ensureSize("PRESSURE_PLATES", 9);
 +
 +    /**
 +     * Covers the 3 variants of prismarine blocks.
 +     */
-+    public static final MaterialSetTag PRISMARINE = new MaterialSetTag()
+    public static final MaterialSetTag PRISMARINE = new MaterialSetTag(keyFor("prismarine"))
 +        .add(Material.PRISMARINE, Material.PRISMARINE_BRICKS, Material.DARK_PRISMARINE);
 +
 +    /**
 +     * Covers the 3 variants of prismarine slabs.
 +     */
-+    public static final MaterialSetTag PRISMARINE_SLABS = new MaterialSetTag()
+    public static final MaterialSetTag PRISMARINE_SLABS = new MaterialSetTag(keyFor("prismarine_slabs"))
 +        .add(Material.PRISMARINE_SLAB, Material.PRISMARINE_BRICK_SLAB, Material.DARK_PRISMARINE_SLAB);
 +
 +    /**
 +     * Covers the 3 variants of prismarine stairs.
 +     */
-+    public static final MaterialSetTag PRISMARINE_STAIRS = new MaterialSetTag()
+    public static final MaterialSetTag PRISMARINE_STAIRS = new MaterialSetTag(keyFor("prismarine_stairs"))
 +        .add(Material.PRISMARINE_STAIRS, Material.PRISMARINE_BRICK_STAIRS, Material.DARK_PRISMARINE_STAIRS);
 +
 +    /**
 +     * Covers the 3 variants of pumpkins.
 +     */
-+    public static final MaterialSetTag PUMPKINS = new MaterialSetTag()
+    public static final MaterialSetTag PUMPKINS = new MaterialSetTag(keyFor("pumpkins"))
 +        .add(Material.CARVED_PUMPKIN, Material.JACK_O_LANTERN, Material.PUMPKIN);
 +
 +    /**
 +     * Covers the 4 variants of quartz blocks.
 +     */
-+    public static final MaterialSetTag QUARTZ_BLOCKS = new MaterialSetTag()
+    public static final MaterialSetTag QUARTZ_BLOCKS = new MaterialSetTag(keyFor("quartz_blocks"))
 +        .add(Material.QUARTZ_BLOCK, Material.QUARTZ_PILLAR, Material.CHISELED_QUARTZ_BLOCK, Material.SMOOTH_QUARTZ);
 +
 +    /**
 +     * Covers all uncooked fish items.
 +     */
-+    public static final MaterialSetTag RAW_FISH = new MaterialSetTag()
+    public static final MaterialSetTag RAW_FISH = new MaterialSetTag(keyFor("raw_fish"))
 +        .add(Material.COD, Material.PUFFERFISH, Material.SALMON, Material.TROPICAL_FISH);
 +
 +    /**
 +     * Covers the 4 variants of red sandstone blocks.
 +     */
-+    public static final MaterialSetTag RED_SANDSTONES = new MaterialSetTag()
+    public static final MaterialSetTag RED_SANDSTONES = new MaterialSetTag(keyFor("red_sandstones"))
 +        .endsWith("RED_SANDSTONE")
 +        .ensureSize("RED_SANDSTONES", 4);
 +
 +    /**
 +     * Covers the 4 variants of sandstone blocks.
 +     */
-+    public static final MaterialSetTag SANDSTONES = new MaterialSetTag()
+    public static final MaterialSetTag SANDSTONES = new MaterialSetTag(keyFor("sandstones"))
 +        .add(Material.SANDSTONE, Material.CHISELED_SANDSTONE, Material.CUT_SANDSTONE, Material.SMOOTH_SANDSTONE);
 +
 +    /**
 +     * Covers sponge and wet sponge.
 +     */
-+    public static final MaterialSetTag SPONGES = new MaterialSetTag()
+    public static final MaterialSetTag SPONGES = new MaterialSetTag(keyFor("sponges"))
 +        .endsWith("SPONGE")
 +        .ensureSize("SPONGES", 2);
 +
 +    /**
 +     * Covers the non-colored and 16 colored shulker boxes.
 +     */
-+    public static final MaterialSetTag SHULKER_BOXES = new MaterialSetTag()
+    public static final MaterialSetTag SHULKER_BOXES = new MaterialSetTag(keyFor("shulker_boxes"))
 +        .endsWith("SHULKER_BOX")
 +        .ensureSize("SHULKER_BOXES", 17);
 +
 +    /**
 +     * Covers zombie, creeper, skeleton, dragon, and player heads.
 +     */
-+    public static final MaterialSetTag SKULLS = new MaterialSetTag()
+    public static final MaterialSetTag SKULLS = new MaterialSetTag(keyFor("skulls"))
 +        .endsWith("_HEAD")
 +        .endsWith("_SKULL")
 +        .not(Material.PISTON_HEAD)
@ -468,35 +505,35 @@ index 00000000..7a48445d
 +    /**
 +     * Covers all spawn egg items.
 +     */
-+    public static final MaterialSetTag SPAWN_EGGS = new MaterialSetTag()
+    public static final MaterialSetTag SPAWN_EGGS = new MaterialSetTag(keyFor("spawn_eggs"))
 +        .endsWith("_SPAWN_EGG")
 +        .ensureSize("SPAWN_EGGS", 51);
 +
 +    /**
 +     * Covers all 16 colors of stained glass.
 +     */
-+    public static final MaterialSetTag STAINED_GLASS = new MaterialSetTag()
+    public static final MaterialSetTag STAINED_GLASS = new MaterialSetTag(keyFor("stained_glass"))
 +        .endsWith("_STAINED_GLASS")
 +        .ensureSize("STAINED_GLASS", 16);
 +
 +    /**
 +     * Covers all 16 colors of stained glass panes.
 +     */
-+    public static final MaterialSetTag STAINED_GLASS_PANES = new MaterialSetTag()
+    public static final MaterialSetTag STAINED_GLASS_PANES = new MaterialSetTag(keyFor("stained_glass_panes"))
 +        .endsWith("STAINED_GLASS_PANE")
 +        .ensureSize("STAINED_GLASS_PANES", 16);
 +
 +    /**
 +     * Covers all 7 variants of trapdoors.
 +     */
-+    public static final MaterialSetTag TRAPDOORS = new MaterialSetTag()
+    public static final MaterialSetTag TRAPDOORS = new MaterialSetTag(keyFor("trapdoors"))
 +        .endsWith("_TRAPDOOR")
 +        .ensureSize("TRAPDOORS", 7);
 +
 +    /**
 +     * Covers all 6 wood variants of fences.
 +     */
-+    public static final MaterialSetTag WOODEN_FENCES = new MaterialSetTag()
+    public static final MaterialSetTag WOODEN_FENCES = new MaterialSetTag(keyFor("wooden_fences"))
 +        .endsWith("_FENCE")
 +        .not(Material.NETHER_BRICK_FENCE)
 +        .ensureSize("WOODEN_FENCES", 6);
@ -504,33 +541,33 @@ index 00000000..7a48445d
 +    /**
 +     * Covers all 6 wood variants of trapdoors.
 +     */
-+    public static final MaterialSetTag WOODEN_TRAPDOORS = new MaterialSetTag()
+    public static final MaterialSetTag WOODEN_TRAPDOORS = new MaterialSetTag(keyFor("wooden_trapdoors"))
 +        .endsWith("_TRAPDOOR")
 +        .not(Material.IRON_TRAPDOOR)
 +        .ensureSize("WOODEN_TRAPDOORS", 6);
 +
-+    public static final MaterialSetTag WOODEN_GATES = new MaterialSetTag()
+    public static final MaterialSetTag WOODEN_GATES = new MaterialSetTag(keyFor("wooden_gates"))
 +        .endsWith("_GATE")
 +        .ensureSize("WOODEN_GATES", 6);
 +
-+    public static final MaterialSetTag PURPUR = new MaterialSetTag()
+    public static final MaterialSetTag PURPUR = new MaterialSetTag(keyFor("purpur"))
 +        .startsWith("PURPUR_")
 +        .ensureSize("PURPUR", 4);
 +
-+    public static final MaterialSetTag SIGNS = new MaterialSetTag()
+    public static final MaterialSetTag SIGNS = new MaterialSetTag(keyFor("signs"))
 +        .add(Material.SIGN, Material.WALL_SIGN)
 +        .ensureSize("SIGNS", 2);
 +
-+    public static final MaterialSetTag TORCH = new MaterialSetTag()
+    public static final MaterialSetTag TORCH = new MaterialSetTag(keyFor("torch"))
 +        .add(Material.TORCH, Material.WALL_TORCH)
 +        .ensureSize("TORCH", 2);
 +
-+    public static final MaterialSetTag REDSTONE_TORCH = new MaterialSetTag()
+    public static final MaterialSetTag REDSTONE_TORCH = new MaterialSetTag(keyFor("restone_torch"))
 +        .add(Material.REDSTONE_TORCH, Material.REDSTONE_WALL_TORCH)
 +        .ensureSize("REDSTONE_TORCH", 2);
 +
 +    @SuppressWarnings("unchecked")
-+    public static final MaterialSetTag COLORABLE = new MaterialSetTag()
+    public static final MaterialSetTag COLORABLE = new MaterialSetTag(keyFor("colorable"))
 +        .add(Tag.WOOL, Tag.CARPETS).add(SHULKER_BOXES, STAINED_GLASS, STAINED_GLASS_PANES, CONCRETES, BEDS);
 +        //.ensureSize("COLORABLE", 81); unit test don't have the vanilla item tags, so counts don't line up for real
 +}
--- a/Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch
@ -1,14 +1,14 @@
-From abcb626661610f113fe89edb1e31532f751b869e Mon Sep 17 00:00:00 2001
+From c512125c7bdca9fbb124be26388fbc9bb820b91b Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 19:44:54 +0000
 Subject: [PATCH] Make the default permission message configurable


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 4acaefa4c..9fab69137 100644
+index cbabd807..2ab73439 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1493,6 +1493,14 @@ public final class Bukkit {
+@@ -1510,6 +1510,14 @@ public final class Bukkit {
         return server.suggestPlayerNamesWhenNullTabCompletions();
     }
 
@ -24,10 +24,10 @@ index 4acaefa4c..9fab69137 100644
      * Creates a PlayerProfile for the specified uuid, with name as null
      * @param uuid UUID to create profile for
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c940f6db9..ae15b0e99 100644
+index 9c5049cd..7c7725a7 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1293,6 +1293,12 @@ public interface Server extends PluginMessageRecipient {
+@@ -1308,6 +1308,12 @@ public interface Server extends PluginMessageRecipient {
      */
     boolean suggestPlayerNamesWhenNullTabCompletions();
 
@ -41,7 +41,7 @@ index c940f6db9..ae15b0e99 100644
      * Creates a PlayerProfile for the specified uuid, with name as null
      * @param uuid UUID to create profile for
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index db7f44289..77171cd17 100644
+index db7f4428..77171cd1 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
@@ -180,7 +180,7 @@ public abstract class Command {