Updated Upstream (Bukkit/CraftBukkit/Spigot)

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

Warning: this commit contains more mapping changes from upstream, As always, ensure that you
have working backups and test this build before deployment; Developers working on paper will,
yet again, need to delete their work/Minecraft/1.13.2 folder

Bukkit Changes:
7fca5fd4 SPIGOT-4558: Preserve user order in the face of copied defaults in configurations
15c9b1eb Ignore spurious slot IDs sent by client, e.g. in enchanting tables
5d2a10c5 SPIGOT-3747: Add API for force loaded chunks
d6dd2bb3 SPIGOT-3538: Add getHitBlockFace for ProjectileHitEvent
771db4aa SPIGOT-794: Call EntityPlaceEvent for Minecart placement
55462509 Add InventoryView#getSlotType
2f3ce5b6 Remove EntityTransformEvent and CustomItemTagContainer from draft API
f04ad7b6 Make ProjectileLaunchEvent extend EntitySpawnEvent
ccb85808 Define EntitySpawnEvent
b8cc3ebe Add PlayerItemDamageEvent
184a495d Ease ClassLoader Deadlocks Where Possible
11ac4728 Expand Boolean Prompt Values in Conversation API
aae62d51 Added getAllSessionData() to the Conversation API.
9290ff91 Add InventoryView#getInventory API
995e530f Add API to get / set base arrow damage

CraftBukkit Changes:
c4a67eed SPIGOT-4556: Fix plugins closing inventory during drop events
5be2ddcb Replace version constants with methods to prevent compiler inlining
a5b9c7b3 Use API method to create offset command completions
2bc7d1df SPIGOT-3747: Add API for force loaded chunks
a408f375 SPIGOT-3538: Add getHitBlockFace for ProjectileHitEvent
b54b9409 SPIGOT-2864: Make Arrow / Item setTicksLived behave like FallingBlock
79ded7a8 SPIGOT-1811: Death message not shown on respawn screen
b4a4f15d SPIGOT-943: InventoryCloseEvent called on death regardless of open inventory
0afed592 SPIGOT-794: Call EntityPlaceEvent for Minecart placement
2b2d084a Add InventoryView#getSlotType
01a9959a Do not use deprecated ItemSpawnEvent constructor
9642498d SPIGOT-4547: Call EntitySpawnEvent as general spawn fallback event
963f4a5f Add PlayerItemDamageEvent
63db0445 Add API to get / set base arrow damage
531c25d7 Add CraftMagicNumbers.MAPPINGS_VERSION for use by NMS plugins
d05c8b14 Mappings Update
bd36e200 SPIGOT-4551: Ignore invalid attribute modifier slots

Spigot Changes:
518206a1 Remove redundant trove depend
1959ad21 MC-11211,SPIGOT-4552: Fix placing double slabs at y = 255
29ab5e43 SPIGOT-3661: Allow arguments in restart-script
7cc46316 SPIGOT-852: Growth modifiers for beetroots, potatoes, carrots
82e117e1 Squelch "fatal: Resolve operation not in progress" message
0a1a68e7 Mappings Update & Patch Rebuild

Spigot-API-Patches/0003-Timings-v2.patch

@@ -1,4 +1,4 @@
-From 3bdfef7c20a6506b0a133f7de68973203f1612ba Mon Sep 17 00:00:00 2001
+From 678d7b0f1eb35e8840a18bad357dd56f9357baa8 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 2ce174401..7fdd1a084 100644
+index 2ce17440..7fdd1a08 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -568,7 +568,6 @@ public final class Bukkit {
@@ -2994,7 +2994,7 @@ index 2ce174401..7fdd1a084 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 63392d5e7..0e7a81c88 100644
+index 63392d5e..0e7a81c8 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1150,12 +1150,27 @@ public interface Server extends PluginMessageRecipient {
@@ -3028,7 +3028,7 @@ index 63392d5e7..0e7a81c88 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 4c931f186..4a479627d 100644
+index 4c931f18..4a479627 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 4c931f186..4a479627d 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 5054276ff..0993f31b1 100644
+index 5054276f..0993f31b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1575,6 +1575,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3523,7 +3523,7 @@ index 5054276ff..0993f31b1 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 8b130abb..80c152ba 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 {
@@ -3580,10 +3580,10 @@ 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 113b899cc..81b428222 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
-@@ -40,7 +40,6 @@ import org.bukkit.plugin.PluginLoader;
+@@ -41,7 +41,6 @@ import org.bukkit.plugin.PluginLoader;
  import org.bukkit.plugin.RegisteredListener;
  import org.bukkit.plugin.TimedRegisteredListener;
  import org.bukkit.plugin.UnknownDependencyException;
@@ -3591,15 +3591,15 @@ index 113b899cc..81b428222 100644
  import org.yaml.snakeyaml.error.YAMLException;
  
  /**
-@@ -51,7 +50,6 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -52,7 +51,6 @@ public final class JavaPluginLoader implements PluginLoader {
      private final Pattern[] fileFilters = new Pattern[] { Pattern.compile("\\.jar$"), };
-     private final Map<String, Class<?>> classes = new java.util.concurrent.ConcurrentHashMap<String, Class<?>>(); // Spigot
+     private final Map<String, Class<?>> classes = new ConcurrentHashMap<String, Class<?>>();
      private final List<PluginClassLoader> loaders = new CopyOnWriteArrayList<PluginClassLoader>();
 -    public static final CustomTimingsHandler pluginParentTimer = new CustomTimingsHandler("** Plugins"); // Spigot
  
      /**
       * This class was not meant to be constructed explicitly
-@@ -291,26 +289,20 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -292,26 +290,20 @@ public final class JavaPluginLoader implements PluginLoader {
                  }
              }
  
@@ -3629,7 +3629,7 @@ index 113b899cc..81b428222 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 af8af8ef0..44093af29 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;
@@ -3640,10 +3640,10 @@ index af8af8ef0..44093af29 100644
 +public final class PluginClassLoader extends URLClassLoader { // Spigot
 +    public JavaPlugin getPlugin() { return plugin; } // Spigot
      private final JavaPluginLoader loader;
-     private final Map<String, Class<?>> classes = new java.util.concurrent.ConcurrentHashMap<String, Class<?>>(); // Spigot
+     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 @@
@@ -3907,5 +3907,5 @@ index 8d982974e..e9f76006e 100644
 +
  }
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0008-Add-PlayerLocaleChangeEvent.patch

@@ -1,4 +1,4 @@
-From cb532e30452b3b3a7143ce5764711c2bf41e92cf Mon Sep 17 00:00:00 2001
+From 6a8a468f3a3b613765b95dea08c1a426bf7cc379 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Mon, 29 Feb 2016 18:02:25 -0600
 Subject: [PATCH] Add PlayerLocaleChangeEvent
@@ -61,5 +61,5 @@ index 00000000..29dd763a
 +    }
 +}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0009-Add-player-view-distance-API.patch

@@ -1,11 +1,11 @@
-From 61bfc392c8504daea86a2eb450c57e4975dec044 Mon Sep 17 00:00:00 2001
+From 34e2633d0c24e40216010eaa456af3b549302069 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 18:05:37 -0600
 Subject: [PATCH] Add player view distance API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a631529df..4208b0d2c 100644
+index a631529d..4208b0d2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1492,6 +1492,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -30,5 +30,5 @@ index a631529df..4208b0d2c 100644
      public class Spigot extends Entity.Spigot
      {
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0012-Automatically-disable-plugins-that-fail-to-load.patch

@@ -1,14 +1,14 @@
-From 9a230e904d502c69610fe0507d3bbaabc19cd059 Mon Sep 17 00:00:00 2001
+From b45f9dba0fc2d0d9839d30d4724b86047a8a9e2a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 19:45:21 -0600
 Subject: [PATCH] Automatically disable plugins that fail to load
 
 
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 81b42822..3af99b5b 100644
+index 54594546..bf972302 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -331,6 +331,10 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -332,6 +332,10 @@ public final class JavaPluginLoader implements PluginLoader {
                  jPlugin.setEnabled(true);
              } catch (Throwable ex) {
                  server.getLogger().log(Level.SEVERE, "Error occurred while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
@@ -20,5 +20,5 @@ index 81b42822..3af99b5b 100644
  
              // Perhaps abort here, rather than continue going, but as it stands,
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0021-Use-ASM-for-event-executors.patch

@@ -1,4 +1,4 @@
-From f027f34cf88ec478b2d4a18131f4ded8915efd06 Mon Sep 17 00:00:00 2001
+From 8782eb89fab27baa72cbe2b29684a49efadbd5af Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 13:20:33 -0700
 Subject: [PATCH] Use ASM for event executors.
@@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/pom.xml b/pom.xml
-index b5cc156cd..310c30bb6 100644
+index f9fbc40a..1d42d42a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -109,6 +109,17 @@
@@ -29,7 +29,7 @@ index b5cc156cd..310c30bb6 100644
      <build>
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
 new file mode 100644
-index 000000000..9ff99e3b3
+index 00000000..9ff99e3b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
 @@ -0,0 +1,40 @@
@@ -75,7 +75,7 @@ index 000000000..9ff99e3b3
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
 new file mode 100644
-index 000000000..f60f01005
+index 00000000..f60f0100
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
 @@ -0,0 +1,39 @@
@@ -120,7 +120,7 @@ index 000000000..f60f01005
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
 new file mode 100644
-index 000000000..140cf0ad3
+index 00000000..140cf0ad
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
 @@ -0,0 +1,44 @@
@@ -170,7 +170,7 @@ index 000000000..140cf0ad3
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
 new file mode 100644
-index 000000000..6941d9fbf
+index 00000000..6941d9fb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
 @@ -0,0 +1,32 @@
@@ -208,7 +208,7 @@ index 000000000..6941d9fbf
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
 new file mode 100644
-index 000000000..1473ff8cd
+index 00000000..1473ff8c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
 @@ -0,0 +1,63 @@
@@ -277,7 +277,7 @@ index 000000000..1473ff8cd
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
 new file mode 100644
-index 000000000..62acbf821
+index 00000000..62acbf82
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
 @@ -0,0 +1,33 @@
@@ -315,7 +315,7 @@ index 000000000..62acbf821
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java
-index 3b2c99ea7..b45b6c1c3 100644
+index 3b2c99ea..b45b6c1c 100644
 --- a/src/main/java/org/bukkit/plugin/EventExecutor.java
 +++ b/src/main/java/org/bukkit/plugin/EventExecutor.java
 @@ -4,9 +4,81 @@ import org.bukkit.event.Event;
@@ -401,10 +401,10 @@ index 3b2c99ea7..b45b6c1c3 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 3af99b5bd..72d506d1f 100644
+index bf972302..77207f14 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -289,20 +289,7 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -290,20 +290,7 @@ public final class JavaPluginLoader implements PluginLoader {
                  }
              }
  
@@ -427,5 +427,5 @@ index 3af99b5bd..72d506d1f 100644
                  eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
              } else {
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0033-Arrow-pickup-rule-API.patch

@@ -1,14 +1,14 @@
-From 5639eb8d022329ed99bb9f92f8dbe416d5e4f377 Mon Sep 17 00:00:00 2001
+From e711715c7ddc2a309bbcb0156ab188fb95fddd32 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 4 Mar 2016 03:13:18 -0500
 Subject: [PATCH] Arrow pickup rule API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java
-index 99814eee..34dde443 100644
+index b74d5f9d..99a44006 100644
 --- a/src/main/java/org/bukkit/entity/Arrow.java
 +++ b/src/main/java/org/bukkit/entity/Arrow.java
-@@ -108,4 +108,38 @@ public interface Arrow extends Projectile {
+@@ -144,4 +144,38 @@ public interface Arrow extends Projectile {
      @Override
      Spigot spigot();
      // Spigot end
@@ -48,5 +48,5 @@ index 99814eee..34dde443 100644
 +    // Paper end
  }
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0044-Fireworks-API-s.patch

@@ -1,4 +1,4 @@
-From 8e86bdb38a51cea9f5b62c820732617366fce895 Mon Sep 17 00:00:00 2001
+From e1ee48a404bc7e7c82193a91cc6fa36b1b46c364 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:55 -0500
 Subject: [PATCH] Fireworks API's
@@ -34,5 +34,5 @@ index b8a8c075..8c087bb7 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0049-Add-configuration-option-to-prevent-player-names-fro.patch

@@ -1,4 +1,4 @@
-From 8b39d39d06c4539f1826da9a4309c0503679928e Mon Sep 17 00:00:00 2001
+From 606a3a3606a8406779eb08b91508a22920ed284b 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
@@ -58,5 +58,5 @@ index 2abe1208..c660c178 100644
          }
          return completions;
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch

@@ -1,4 +1,4 @@
-From a33b574c104eaa05eebba870a7d61b1a5876d5ed Mon Sep 17 00:00:00 2001
+From 06cac40ce638d8f3f57fdb32b3e2a6d377800ac4 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 10 Jun 2017 16:59:40 -0500
 Subject: [PATCH] Fix upstream javadoc warnings and errors
@@ -21,10 +21,10 @@ index 43239f84..fe8d3468 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 04573ec2..0750d64c 100644
+index 6ce38e03..e66caa41 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1570,6 +1570,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1603,6 +1603,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -32,7 +32,7 @@ index 04573ec2..0750d64c 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, T data);
  
-@@ -1585,6 +1586,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1618,6 +1619,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -40,7 +40,7 @@ index 04573ec2..0750d64c 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, T data);
  
-@@ -1634,6 +1636,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1667,6 +1669,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -48,7 +48,7 @@ index 04573ec2..0750d64c 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data);
  
-@@ -1653,6 +1656,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1686,6 +1689,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -56,7 +56,7 @@ index 04573ec2..0750d64c 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data);
  
-@@ -1708,6 +1712,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1741,6 +1745,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -64,7 +64,7 @@ index 04573ec2..0750d64c 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
  
-@@ -1729,6 +1734,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1762,6 +1767,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -72,7 +72,7 @@ index 04573ec2..0750d64c 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
  
-@@ -1751,6 +1757,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1784,6 +1790,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param force whether to send the particle to players within an extended
       *              range and encourage their client to render it regardless of
       *              settings
@@ -80,7 +80,7 @@ index 04573ec2..0750d64c 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force);
  
-@@ -1775,6 +1782,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1808,6 +1815,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param force whether to send the particle to players within an extended
       *              range and encourage their client to render it regardless of
       *              settings

Spigot-API-Patches/0067-Add-workaround-for-plugins-modifying-the-parent-of-t.patch

@@ -1,4 +1,4 @@
-From 62be624eee349e6f2381582d772249d57a485fc7 Mon Sep 17 00:00:00 2001
+From 5e6d3bf1e2743a13eb1876f0513dc3f92bacdccb Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 19:41:20 +0200
 Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin
@@ -14,7 +14,7 @@ parent of the plugin logger to avoid this.
 
 diff --git a/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java
 new file mode 100644
-index 000000000..d052b2f55
+index 00000000..d052b2f5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java
 @@ -0,0 +1,39 @@
@@ -58,7 +58,7 @@ index 000000000..d052b2f55
 +
 +}
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index a81dae439..15f22ade2 100644
+index a81dae43..15f22ade 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 @@ -42,7 +42,7 @@ public abstract class JavaPlugin extends PluginBase {
@@ -85,7 +85,7 @@ index a81dae439..15f22ade2 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 44093af29..ab79b71bf 100644
+index bc33ff33..213f6234 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -36,6 +36,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -94,9 +94,9 @@ index 44093af29..ab79b71bf 100644
      private IllegalStateException pluginState;
 +    private java.util.logging.Logger logger; // Paper - add field
  
-     // Spigot Start
-     static
-@@ -73,6 +74,8 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
+     static {
+         ClassLoader.registerAsParallelCapable();
+@@ -53,6 +54,8 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
          this.manifest = jar.getManifest();
          this.url = file.toURI().toURL();
  
@@ -105,7 +105,7 @@ index 44093af29..ab79b71bf 100644
          try {
              Class<?> jarClass;
              try {
-@@ -189,6 +192,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
+@@ -169,6 +172,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
          pluginState = new IllegalStateException("Initial initialization");
          this.pluginInit = javaPlugin;
  
@@ -114,5 +114,5 @@ index 44093af29..ab79b71bf 100644
      }
  }
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch

@@ -1,4 +1,4 @@
-From ee7e882548af6130d040e4a16132a155e44be107 Mon Sep 17 00:00:00 2001
+From af0861873204100e974bd6b187f72c398de472c9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:28:55 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5f3e085e3..1e349066d 100644
+index 5f3e085e..1e349066 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3,6 +3,7 @@ package org.bukkit.entity;
@@ -38,5 +38,5 @@ index 5f3e085e3..1e349066d 100644
  
      // Spigot start
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0088-getPlayerUniqueId-API.patch

@@ -1,4 +1,4 @@
-From 8ddad2ac0889f686038b73a4b10aaf8a3a6333fc Mon Sep 17 00:00:00 2001
+From e1d2e8f216b7fda9a9c87aa3540e2b73307a19d7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 22 Mar 2018 01:39:28 -0400
 Subject: [PATCH] getPlayerUniqueId API
@@ -57,5 +57,5 @@ index 9e7bc162..b8076fc3 100644
       * Gets the plugin manager for interfacing with plugins.
       *
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0089-Add-legacy-ping-support-to-PaperServerListPingEvent.patch

@@ -1,4 +1,4 @@
-From e730e57eded25def56fa85f4d51aa44cbcc5a135 Mon Sep 17 00:00:00 2001
+From 3866b0ae220a8374b807898691fa739df7b004f8 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 19:30:20 +0200
 Subject: [PATCH] Add legacy ping support to PaperServerListPingEvent
@@ -29,5 +29,5 @@ index 517d1523..ffda9f6a 100644
 +
  }
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch

@@ -1,4 +1,4 @@
-From 0ccef7fd8a50d98175e9cac5f171ee4d12d037f3 Mon Sep 17 00:00:00 2001
+From 5daba95426cb5d3ab09db50d25acc35aac87bcf0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 17:55:28 -0400
 Subject: [PATCH] Additional world.getNearbyEntities API's
@@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
 Provides more methods to get nearby entities, and filter by types and predicates
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 849ad2cb..99fbf327 100644
+index e66caa41..d9010176 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -2,6 +2,8 @@ package org.bukkit;
@@ -18,7 +18,7 @@ index 849ad2cb..99fbf327 100644
  import java.util.Collection;
  import java.util.HashMap;
  import java.util.List;
-@@ -447,6 +449,238 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -480,6 +482,238 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public Collection<Entity> getEntitiesByClasses(Class<?>... classes);
  
@@ -258,5 +258,5 @@ index 849ad2cb..99fbf327 100644
       * Get a list of all players in this World
       *
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch

@@ -1,4 +1,4 @@
-From 2e6605a41302606cb9c28be3fa9d967d67dfd437 Mon Sep 17 00:00:00 2001
+From 56c0296c4c259c68f03a2e35acc9e39501046e95 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 29 Aug 2017 23:58:48 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -452,10 +452,10 @@ index 4d0acaf5..827aa00c 100644
       * Options which can be applied to redstone dust particles - a particle
       * color and size.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 3cc161de..c9b3ff76 100644
+index d9010176..379fd2fa 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1970,7 +1970,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2003,7 +2003,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *             the type of this depends on {@link Particle#getDataType()}
       * @param <T> Type
       */

Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch

@@ -1,4 +1,4 @@
-From 58698c7b920454d0f0171be3ff53e4df1471dc44 Mon Sep 17 00:00:00 2001
+From c5d36c89c26360428075ecd830da4f65b2c2de11 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
@@ -7,7 +7,7 @@ This should close more memory leaks from /reload and disabling plugins,
 by closing the class loader and the jar file.
 
 diff --git a/src/main/java/org/bukkit/plugin/PluginLoader.java b/src/main/java/org/bukkit/plugin/PluginLoader.java
-index e7981a1d9..d34756f15 100644
+index e7981a1d..d34756f1 100644
 --- a/src/main/java/org/bukkit/plugin/PluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/PluginLoader.java
 @@ -73,4 +73,19 @@ public interface PluginLoader {
@@ -31,7 +31,7 @@ index e7981a1d9..d34756f15 100644
 +    // Paper end - close Classloader on disable
  }
 diff --git a/src/main/java/org/bukkit/plugin/PluginManager.java b/src/main/java/org/bukkit/plugin/PluginManager.java
-index e5638d560..b72d5a9bc 100644
+index e5638d56..b72d5a9b 100644
 --- a/src/main/java/org/bukkit/plugin/PluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/PluginManager.java
 @@ -154,6 +154,18 @@ public interface PluginManager {
@@ -54,7 +54,7 @@ index e5638d560..b72d5a9bc 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 bd0588a20..cb2b0b9cb 100644
+index bd0588a2..cb2b0b9c 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 {
@@ -100,10 +100,10 @@ index bd0588a20..cb2b0b9cb 100644
              lookupNames.clear();
              HandlerList.unregisterAll();
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 72d506d1f..3411a365c 100644
+index 77207f14..c7782e7d 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -319,7 +319,7 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -320,7 +320,7 @@ public final class JavaPluginLoader implements PluginLoader {
              } catch (Throwable ex) {
                  server.getLogger().log(Level.SEVERE, "Error occurred while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
                  // Paper start - Disable plugins that fail to load
@@ -112,7 +112,7 @@ index 72d506d1f..3411a365c 100644
                  return;
                  // Paper end
              }
-@@ -330,7 +330,13 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -331,7 +331,13 @@ public final class JavaPluginLoader implements PluginLoader {
          }
      }
  
@@ -126,7 +126,7 @@ index 72d506d1f..3411a365c 100644
          Validate.isTrue(plugin instanceof JavaPlugin, "Plugin is not associated with this PluginLoader");
  
          if (plugin.isEnabled()) {
-@@ -357,6 +363,16 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -358,6 +364,16 @@ public final class JavaPluginLoader implements PluginLoader {
                  for (String name : names) {
                      removeClass(name);
                  }
@@ -144,5 +144,5 @@ index 72d506d1f..3411a365c 100644
          }
      }
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0112-Expand-Explosions-API.patch

@@ -1,4 +1,4 @@
-From 73be070d77dd79f210bf045c6ec01bf2ecf72f18 Mon Sep 17 00:00:00 2001
+From 469a7079d60dae81be5b7752cd439756a62718b7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:24:42 -0500
 Subject: [PATCH] Expand Explosions API
@@ -98,10 +98,10 @@ index 162a76e8..056a4d6b 100644
      @Override
      public boolean equals(Object obj) {
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 1f63eba8..e83b2ac7 100644
+index 379fd2fa..70e7c9e3 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1115,6 +1115,102 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1148,6 +1148,102 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public boolean createExplosion(Location loc, float power, boolean setFire);
  
@@ -205,5 +205,5 @@ index 1f63eba8..e83b2ac7 100644
       * Gets the {@link Environment} type of this world
       *
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch

@@ -1,14 +1,14 @@
-From 596f70a064c3481f5197b4b17cd4126e9dd8799a Mon Sep 17 00:00:00 2001
+From 203c520625cc337506bde2c144f1dda95231a000 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:07:16 +0200
 Subject: [PATCH] Add World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index e83b2ac7..7c700cc2 100644
+index 70e7c9e3..301d9418 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -705,6 +705,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -738,6 +738,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public Collection<Entity> getNearbyEntities(Location location, double x, double y, double z);
  
@@ -26,5 +26,5 @@ index e83b2ac7..7c700cc2 100644
       * Returns a list of entities within a bounding box centered around a
       * Location.
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0116-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch

@@ -1,57 +0,0 @@
-From 2bf0516d4ec180c0bbd9f50c67f205a99b8c08ca Mon Sep 17 00:00:00 2001
-From: Brokkonaut <hannos17@gmx.de>
-Date: Sat, 30 Jun 2018 05:45:04 +0200
-Subject: [PATCH] Improve ProjectileHitEvent to include the BlockFace where the
- projectile has hit
-
-
-diff --git a/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java b/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
-index 35f4148bb..db105e764 100644
---- a/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
-+++ b/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
-@@ -12,6 +12,7 @@ public class ProjectileHitEvent extends EntityEvent {
-     private static final HandlerList handlers = new HandlerList();
-     private final Entity hitEntity;
-     private final Block hitBlock;
-+    private final org.bukkit.block.BlockFace hitBlockFace; // Paper
- 
-     public ProjectileHitEvent(final Projectile projectile) {
-         this(projectile, null, null);
-@@ -26,9 +27,16 @@ public class ProjectileHitEvent extends EntityEvent {
-     }
- 
-     public ProjectileHitEvent(final Projectile projectile, Entity hitEntity, Block hitBlock) {
-+        // Paper Start - Add a constructor that includes a BlockFace parameter
-+        this(projectile, hitEntity, hitBlock, null);
-+    }
-+
-+    public ProjectileHitEvent(final Projectile projectile, Entity hitEntity, Block hitBlock, org.bukkit.block.BlockFace hitBlockFace) {
-+        // Paper End
-         super(projectile);
-         this.hitEntity = hitEntity;
-         this.hitBlock = hitBlock;
-+        this.hitBlockFace = hitBlockFace; // Paper
-     }
- 
-     @Override
-@@ -45,6 +53,17 @@ public class ProjectileHitEvent extends EntityEvent {
-         return hitBlock;
-     }
- 
-+    // Paper Start
-+    /**
-+     * Gets the face of the block that the projectile has hit.
-+     *
-+     * @return hit block face or else null
-+     */
-+    public org.bukkit.block.BlockFace getHitBlockFace() {
-+        return hitBlockFace;
-+    }
-+    // Paper End
-+
-     /**
-      * Gets the entity that was hit, if it was an entity that was hit.
-      *
--- 
-2.18.0
-

Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch

@@ -1,4 +1,4 @@
-From e555fe63f21a161afa93b949759f1a0ed9dbea57 Mon Sep 17 00:00:00 2001
+From 79b0b5b19b53d8ecf4eeeae5adbd66d271ce7fd1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:52:52 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index ca789867d..d4b3caebd 100644
+index ca789867..d4b3caeb 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -138,6 +138,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
@@ -27,7 +27,7 @@ index ca789867d..d4b3caebd 100644
       * Returns the ItemStack currently in your hand, can be empty.
       *
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
-index 19889b278..e6e45b936 100644
+index 19889b27..e6e45b93 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
 @@ -11,8 +11,58 @@ import org.bukkit.inventory.InventoryView;
@@ -90,5 +90,5 @@ index 19889b278..e6e45b936 100644
  
      /**
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0118-Entity-getChunk-API.patch

@@ -1,4 +1,4 @@
-From f2dced1d9d8a844f6760f7d9c39a1c6d1837ff90 Mon Sep 17 00:00:00 2001
+From 24a392e31d55b9c82325f678c70eddee787ade76 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 02:25:48 -0400
 Subject: [PATCH] Entity#getChunk API

Spigot-API-Patches/0119-Vex-getSummoner-API.patch

@@ -1,4 +1,4 @@
-From d3bc8ae26091d52609c73bcd0e6d97f71724aa16 Mon Sep 17 00:00:00 2001
+From b1935b33977f5215db28c156d7f75428b14f6ff3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:29:21 -0400
 Subject: [PATCH] Vex#getSummoner API
@@ -6,7 +6,7 @@ Subject: [PATCH] Vex#getSummoner API
 Get's the Mob that summoned this Vex
 
 diff --git a/src/main/java/org/bukkit/entity/Vex.java b/src/main/java/org/bukkit/entity/Vex.java
-index a2f2fcaec..d395e405d 100644
+index a2f2fcae..d395e405 100644
 --- a/src/main/java/org/bukkit/entity/Vex.java
 +++ b/src/main/java/org/bukkit/entity/Vex.java
 @@ -3,4 +3,10 @@ package org.bukkit.entity;
@@ -22,5 +22,5 @@ index a2f2fcaec..d395e405d 100644
 +
 +}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0120-Add-an-asterisk-to-legacy-API-plugins.patch

@@ -1,4 +1,4 @@
-From 218ebb72abe3b026f00a6378ff1529e4e2210c0b Mon Sep 17 00:00:00 2001
+From 6a6db0639bc7f151df29e0df293006646abf49b1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 19 Jul 2018 15:07:02 -0500
 Subject: [PATCH] Add an asterisk to legacy API plugins
@@ -7,7 +7,7 @@ Not here to name and shame, only so server admins can be aware of which
 plugins have and haven't been updated.
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index a4aabfe7f..f462b631b 100644
+index a4aabfe7..f462b631 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -67,4 +67,10 @@ public interface UnsafeValues {
@@ -22,7 +22,7 @@ index a4aabfe7f..f462b631b 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
-index b1d384e82..72c0c0bc6 100644
+index b1d384e8..72c0c0bc 100644
 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
 @@ -38,7 +38,14 @@ public class PluginsCommand extends BukkitCommand {
@@ -42,10 +42,10 @@ index b1d384e82..72c0c0bc6 100644
  
          StringBuilder pluginList = new StringBuilder();
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 3cff01b6b..2b9aad0a7 100644
+index c7782e7d..39f92d88 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -303,7 +303,14 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -304,7 +304,14 @@ public final class JavaPluginLoader implements PluginLoader {
          Validate.isTrue(plugin instanceof JavaPlugin, "Plugin is not associated with this PluginLoader");
  
          if (!plugin.isEnabled()) {
@@ -62,5 +62,5 @@ index 3cff01b6b..2b9aad0a7 100644
              JavaPlugin jPlugin = (JavaPlugin) plugin;
  
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0121-EnderDragon-Events.patch

@@ -1,4 +1,4 @@
-From 7388904ff97bc9690a82713c6d2dde88ae1551bc Mon Sep 17 00:00:00 2001
+From 64eef514b6ae25b70d6492dd9d96b6cdcdd3931f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:51:05 -0500
 Subject: [PATCH] EnderDragon Events
@@ -6,7 +6,7 @@ Subject: [PATCH] EnderDragon Events
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java
 new file mode 100644
-index 000000000..ef2a8dab9
+index 00000000..ef2a8dab
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java
 @@ -0,0 +1,72 @@
@@ -84,7 +84,7 @@ index 000000000..ef2a8dab9
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java
 new file mode 100644
-index 000000000..d8c3ab330
+index 00000000..d8c3ab33
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java
 @@ -0,0 +1,56 @@
@@ -146,7 +146,7 @@ index 000000000..d8c3ab330
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java
 new file mode 100644
-index 000000000..aa70dda10
+index 00000000..aa70dda1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java
 @@ -0,0 +1,56 @@
@@ -207,5 +207,5 @@ index 000000000..aa70dda10
 +    }
 +}
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0122-PlayerLaunchProjectileEvent.patch

@@ -1,4 +1,4 @@
-From e3f49113573e7c633b84682c11837436b0eb86c5 Mon Sep 17 00:00:00 2001
+From b36a6f13151c1fc128d1c0233f1bb4df1a7f6e76 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 03:10:50 -0500
 Subject: [PATCH] PlayerLaunchProjectileEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerLaunchProjectileEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java
 new file mode 100644
-index 000000000..d2b244a41
+index 00000000..d2b244a4
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java
 @@ -0,0 +1,78 @@
@@ -89,5 +89,5 @@ index 000000000..d2b244a41
 +    }
 +}
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0123-PlayerElytraBoostEvent.patch

@@ -1,4 +1,4 @@
-From 38df31e7cde8343c5d9df88d292baf068a60b628 Mon Sep 17 00:00:00 2001
+From b25f41eb2d736563f05bf96f5fb27fa6eddfecd9 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:59:53 -0500
 Subject: [PATCH] PlayerElytraBoostEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerElytraBoostEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java
 new file mode 100644
-index 000000000..cecb2182c
+index 00000000..cecb2182
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java
 @@ -0,0 +1,80 @@
@@ -91,5 +91,5 @@ index 000000000..cecb2182c
 +    }
 +}
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0124-EntityTransformedEvent.patch

@@ -1,4 +1,4 @@
-From 5209ff5cba1819570522bccc6319375b8c531146 Mon Sep 17 00:00:00 2001
+From 00607241674731c78d1bcb0da531d41e6cf92255 Mon Sep 17 00:00:00 2001
 From: Anthony MacAllister <anthonymmacallister@gmail.com>
 Date: Thu, 26 Jul 2018 15:28:53 -0400
 Subject: [PATCH] EntityTransformedEvent
@@ -103,5 +103,5 @@ index 00000000..12194f1f
 +    }
 +}
 -- 
-2.17.1
+2.20.1
 

Spigot-API-Patches/0125-Allow-disabling-armour-stand-ticking.patch

@@ -1,11 +1,11 @@
-From d1d6a6e701f0046fcae6f5a937d66e7b0698cdc5 Mon Sep 17 00:00:00 2001
+From b3cef7931e7f7432927b1fefc8282c4b5e554045 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 15 Aug 2018 01:26:03 -0700
 Subject: [PATCH] Allow disabling armour stand ticking
 
 
 diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index 099da6ce1..859f166fb 100644
+index 099da6ce..859f166f 100644
 --- a/src/main/java/org/bukkit/entity/ArmorStand.java
 +++ b/src/main/java/org/bukkit/entity/ArmorStand.java
 @@ -275,5 +275,21 @@ public interface ArmorStand extends LivingEntity {
@@ -31,5 +31,5 @@ index 099da6ce1..859f166fb 100644
      // Paper end
  }
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0126-SkeletonHorse-Additions.patch

@@ -1,4 +1,4 @@
-From f7db1f306087584741afcbcc990658478a0c17b0 Mon Sep 17 00:00:00 2001
+From 691303b8d4cabb5dd2a8b0a2b4d1562a613934f1 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 27 Jul 2018 22:36:17 -0500
 Subject: [PATCH] SkeletonHorse Additions
@@ -6,7 +6,7 @@ Subject: [PATCH] SkeletonHorse Additions
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
 new file mode 100644
-index 000000000..55bae018e
+index 00000000..55bae018
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
 @@ -0,0 +1,43 @@
@@ -54,7 +54,7 @@ index 000000000..55bae018e
 +}
 +
 diff --git a/src/main/java/org/bukkit/entity/SkeletonHorse.java b/src/main/java/org/bukkit/entity/SkeletonHorse.java
-index b2c6b6a86..ba9983463 100644
+index b2c6b6a8..ba998346 100644
 --- a/src/main/java/org/bukkit/entity/SkeletonHorse.java
 +++ b/src/main/java/org/bukkit/entity/SkeletonHorse.java
 @@ -3,4 +3,12 @@ package org.bukkit.entity;
@@ -72,5 +72,5 @@ index b2c6b6a86..ba9983463 100644
 +    // Paper end
 +}
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0127-Expand-Location-Manipulation-API.patch

@@ -1,4 +1,4 @@
-From a05d7aa6619f01679e452a714e900a5c14f4ffdc Mon Sep 17 00:00:00 2001
+From df879ce4d5f270cd7b52d86948b8a4401a9d543d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 25 Jul 2018 01:36:07 -0400
 Subject: [PATCH] Expand Location Manipulation API
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand Location Manipulation API
 Adds set(x, y, z), add(base, x, y, z), subtract(base, x, y, z);
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 056a4d6bb..8dcb15fb8 100644
+index 056a4d6b..8dcb15fb 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -503,6 +503,51 @@ public class Location implements Cloneable, ConfigurationSerializable {
@@ -62,5 +62,5 @@ index 056a4d6bb..8dcb15fb8 100644
       * @return A new location where X/Y/Z are on the Block location (integer value of X/Y/Z)
       */
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0128-Expand-ArmorStand-API.patch

@@ -1,4 +1,4 @@
-From a25458fced284f9f77b50f45aab28446751859de Mon Sep 17 00:00:00 2001
+From ee715356b1b15cf9d00a6761b77d10dbbc08b2e5 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Thu, 26 Jul 2018 02:22:44 -0400
 Subject: [PATCH] Expand ArmorStand API
@@ -8,7 +8,7 @@ Add the following:
 - Enable/Disable slot interactions
 
 diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index 859f166fb..eda4873d5 100644
+index 859f166f..eda4873d 100644
 --- a/src/main/java/org/bukkit/entity/ArmorStand.java
 +++ b/src/main/java/org/bukkit/entity/ArmorStand.java
 @@ -1,5 +1,6 @@
@@ -115,5 +115,5 @@ index 859f166fb..eda4873d5 100644
      // Paper end
  }
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0129-AnvilDamageEvent.patch

@@ -1,4 +1,4 @@
-From b08e64c433d4014812d1c11d8ef43268f6804dcb Mon Sep 17 00:00:00 2001
+From 0f9d603a9e7c9ab64802df817318b11c73fc40e3 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 20 Jul 2018 23:36:55 -0500
 Subject: [PATCH] AnvilDamageEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] AnvilDamageEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java
 new file mode 100644
-index 000000000..fd3c5c02e
+index 00000000..fd3c5c02
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java
 @@ -0,0 +1,139 @@
@@ -150,5 +150,5 @@ index 000000000..fd3c5c02e
 +    }
 +}
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch

@@ -1,4 +1,4 @@
-From 2c3530cf31446f0d52627710e8417518c98b3565 Mon Sep 17 00:00:00 2001
+From dabd3e4d0f10c1edbf09632a331af369251570b1 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,7 +16,7 @@ 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 cb2b0b9cb..a7dd902fb 100644
+index cb2b0b9c..a7dd902f 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 {
@@ -79,7 +79,7 @@ index cb2b0b9cb..a7dd902fb 100644
          RegisteredListener[] listeners = handlers.getRegisteredListeners();
  
 diff --git a/src/test/java/org/bukkit/plugin/PluginManagerTest.java b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
-index 6b86128e1..56308c0c6 100644
+index 6b86128e..56308c0c 100644
 --- a/src/test/java/org/bukkit/plugin/PluginManagerTest.java
 +++ b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
 @@ -19,7 +19,7 @@ public class PluginManagerTest {
@@ -118,5 +118,5 @@ index 6b86128e1..56308c0c6 100644
      @Test
      public void testAsyncUnlocked() throws InterruptedException {
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0131-Add-hand-to-bucket-events.patch

@@ -1,11 +1,11 @@
-From 540ea528206d24ac317b8f88b0524917a54dc7ca Mon Sep 17 00:00:00 2001
+From ee92360b2c18d34c94f3e40c293fdc53ac681ba5 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Aug 2018 08:44:20 -0500
 Subject: [PATCH] Add hand to bucket events
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
-index 8fb121a91..7b9596f30 100644
+index 8fb121a9..7b9596f3 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
 @@ -5,6 +5,7 @@ import org.bukkit.block.Block;
@@ -30,7 +30,7 @@ index 8fb121a91..7b9596f30 100644
      public HandlerList getHandlers() {
          return handlers;
 diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
-index 56584687f..3dbe428ba 100644
+index 56584687..3dbe428b 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
 @@ -5,6 +5,7 @@ import org.bukkit.block.Block;
@@ -82,7 +82,7 @@ index 56584687f..3dbe428ba 100644
          return cancelled;
      }
 diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
-index 94e042a36..884b9240b 100644
+index 94e042a3..884b9240 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
 @@ -5,6 +5,7 @@ import org.bukkit.block.Block;
@@ -107,5 +107,5 @@ index 94e042a36..884b9240b 100644
      public HandlerList getHandlers() {
          return handlers;
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0132-Add-TNTPrimeEvent.patch

@@ -1,4 +1,4 @@
-From 3d3caa8002d35ede44fd008d5b92ff4db850dfc6 Mon Sep 17 00:00:00 2001
+From 158e880fb788c001e8f0488860132577c9b0bdc9 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 15 Jul 2018 22:17:55 +0300
 Subject: [PATCH] Add TNTPrimeEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add TNTPrimeEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
 new file mode 100644
-index 000000000..2ae8826bb
+index 00000000..2ae8826b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
 @@ -0,0 +1,108 @@
@@ -119,5 +119,5 @@ index 000000000..2ae8826bb
 +    }
 +}
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch

@@ -1,4 +1,4 @@
-From e1702becffffcfef95443310f01d1b93dcd5e38f Mon Sep 17 00:00:00 2001
+From 29b931883c7086125b1f923b07f1282da12564f0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 4 Aug 2018 19:37:35 -0400
 Subject: [PATCH] Provide Chunk Coordinates as a Long API
@@ -7,7 +7,7 @@ Allows you to easily access the chunks X/z as a long, and a method
 to look up by the long key too.
 
 diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index 079b9feb..b347a3cc 100644
+index 441ed7ad..33cd0ea0 100644
 --- a/src/main/java/org/bukkit/Chunk.java
 +++ b/src/main/java/org/bukkit/Chunk.java
 @@ -23,6 +23,32 @@ public interface Chunk {
@@ -44,7 +44,7 @@ index 079b9feb..b347a3cc 100644
       * Gets the world containing this chunk
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 7c700cc2..00d72565 100644
+index 301d9418..deabd400 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -139,6 +139,21 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -70,5 +70,5 @@ index 7c700cc2..00d72565 100644
       * Checks if the specified {@link Chunk} is loaded
       *
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0134-Async-Chunks-API.patch

@@ -1,4 +1,4 @@
-From bad3fe871eeaf7fe3ce39307f84193c264c833cb Mon Sep 17 00:00:00 2001
+From 950ee556b124e63be9df736c7a6297cdfa3030d7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 17:43:33 -0600
 Subject: [PATCH] Async Chunks API
@@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously.
 Also adds utility methods to Entity to teleport asynchronously.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 00d72565..8e322cab 100644
+index deabd400..92688252 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -152,6 +152,352 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -365,7 +365,7 @@ index 00d72565..8e322cab 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index f94160bf..5ee57656 100644
+index 2dd7a03c..59787c47 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -135,6 +135,28 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -398,5 +398,5 @@ index f94160bf..5ee57656 100644
       * Returns a list of entities within a bounding box centered around this
       * entity
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0135-Make-EnderDragon-extend-Mob.patch

@@ -1,4 +1,4 @@
-From acdfbc0be6e8f8c4802d06818ad3fc506bbd2924 Mon Sep 17 00:00:00 2001
+From 6361a0fad5e6fda97790f4f72d39cdda3b766fcb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 10 Aug 2018 22:08:34 -0400
 Subject: [PATCH] Make EnderDragon extend Mob
@@ -18,5 +18,5 @@ index 7170d37a..3ba49208 100644
      /**
       * Represents a phase or action that an Ender Dragon can perform.
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch

@@ -1,11 +1,11 @@
-From 137d156f83cec3d2648e58d9701643131e773877 Mon Sep 17 00:00:00 2001
+From c70c957d8f12e7449791fc452632a12e3b316800 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:04:58 -0400
 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
 
 
 diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index b347a3ccf..8a8043351 100644
+index 33cd0ea0..35407d5e 100644
 --- a/src/main/java/org/bukkit/Chunk.java
 +++ b/src/main/java/org/bukkit/Chunk.java
 @@ -93,12 +93,24 @@ public interface Chunk {
@@ -35,5 +35,5 @@ index b347a3ccf..8a8043351 100644
      /**
       * Checks if the chunk is loaded.
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch

@@ -1,11 +1,11 @@
-From db089bcf65dcc04d651a6f5a1efc594ffc0956eb Mon Sep 17 00:00:00 2001
+From 437e17e4c522a9e7f87441f3b44efc36166f8b53 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:19:37 -0400
 Subject: [PATCH] Don't use snapshots for Timings Tile Entity reports
 
 
 diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
-index c2c2fb83..769facd8 100644
+index 28d0954a..7ad9400a 100644
 --- a/src/main/java/co/aikar/timings/TimingHistory.java
 +++ b/src/main/java/co/aikar/timings/TimingHistory.java
 @@ -118,7 +118,7 @@ public class TimingHistory {
@@ -18,5 +18,5 @@ index c2c2fb83..769facd8 100644
                              Bukkit.getLogger().warning("Null tileentity detected in chunk at position x: " + chunk.getX() + ", z: " + chunk.getZ());
                              continue;
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch

@@ -1,4 +1,4 @@
-From 6c57e466396348da4e30c996c0d1f3b8555d5ea2 Mon Sep 17 00:00:00 2001
+From 10ce18ced17baa36f2ffe0e9a3604e314d20830f Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 14 Aug 2018 21:42:10 -0700
 Subject: [PATCH] Allow Blocks to be accessed via a long key
@@ -49,7 +49,7 @@ index 8dcb15fb..7e1ee875 100644
       * @return A new location where X/Y/Z are the center of the block
       */
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 6635285f..071a8490 100644
+index 92688252..1467debe 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -75,6 +75,37 @@ public interface World extends PluginMessageRecipient, Metadatable {

Spigot-API-Patches/0139-Slime-Pathfinder-Events.patch

@@ -1,4 +1,4 @@
-From 9525177fd2b2c81a4b586beaa0df3f4190c7fca8 Mon Sep 17 00:00:00 2001
+From 6c82e7b5c506dfd85e0f5d607c218966c035e06c Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 08:18:27 -0500
 Subject: [PATCH] Slime Pathfinder Events
@@ -207,5 +207,5 @@ index 1119e26e..c4791f95 100644
 +    // Paper end
  }
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0140-isChunkGenerated-API.patch

@@ -1,4 +1,4 @@
-From f36153fbc7b8b55a0bb0529803d9e1fc60c14f36 Mon Sep 17 00:00:00 2001
+From 5bc40b8e037de01dacf424153054ac40301efefa Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Tue, 21 Aug 2018 19:39:46 -0700
 Subject: [PATCH] isChunkGenerated API
@@ -33,7 +33,7 @@ index 7e1ee875..9457832b 100644
      /**
       * Sets the position of this Location and returns itself
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index adace47c..de89122e 100644
+index 1467debe..668c9b7a 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -184,6 +184,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -55,5 +55,5 @@ index adace47c..de89122e 100644
       * This is the Legacy API before Java 8 was supported. Java 8 Consumer is provided,
       * as well as future support
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0141-Add-More-Creeper-API.patch

@@ -1,4 +1,4 @@
-From 9170ad8b1b11975233995f46a677b145286c471b Mon Sep 17 00:00:00 2001
+From eb0f960daf853e86b7b33d48033746b6fe4a0e4d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 11:50:16 -0500
 Subject: [PATCH] Add More Creeper API
@@ -98,5 +98,5 @@ index f957d836..b9877fb8 100644
 +    // Paper end
  }
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0142-Add-PhantomPreSpawnEvent.patch

@@ -1,4 +1,4 @@
-From db18095b2d1d5564f7b2395ed59f548b79e50e7c Mon Sep 17 00:00:00 2001
+From f5a1ce4f2c76ea0c0e04db4c4f8e292923864147 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 25 Aug 2018 19:56:42 -0500
 Subject: [PATCH] Add PhantomPreSpawnEvent
@@ -59,5 +59,5 @@ index 1a1044ed..65b703a2 100644
 +    // Paper end
  }
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0143-Add-source-block-to-BlockPhysicsEvent.patch

@@ -1,4 +1,4 @@
-From 488d14432be0bcc7e88db13e81a1e60de0789365 Mon Sep 17 00:00:00 2001
+From f6670ef133f3fce494c9f54045f6267657603349 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Thu, 23 Aug 2018 16:14:25 +0800
 Subject: [PATCH] Add source block to BlockPhysicsEvent
@@ -44,5 +44,5 @@ index 5e47eabe..9d9e4712 100644
  
      /**
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0144-Inventory-removeItemAnySlot.patch

@@ -1,4 +1,4 @@
-From 3f760c70899a4bd65a6c1489e7508f64b60b7339 Mon Sep 17 00:00:00 2001
+From 28b07fbe11475f6ab3ce856ba3aa93cb64bfc4c5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 28 Aug 2018 23:04:06 -0400
 Subject: [PATCH] Inventory#removeItemAnySlot
@@ -43,5 +43,5 @@ index 2dbba001..ec58e972 100644
       * Returns all ItemStacks from the inventory
       *
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0145-Add-Force-Loaded-Chunk-API.patch

@@ -1,55 +0,0 @@
-From 14a1db13c30927e0e9b1b1b9540aab8f749b1df7 Mon Sep 17 00:00:00 2001
-From: willies952002 <admin@domnian.com>
-Date: Wed, 29 Aug 2018 00:37:30 -0400
-Subject: [PATCH] Add Force-Loaded Chunk API
-
-
-diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index 8a804335..4b9e0ca4 100644
---- a/src/main/java/org/bukkit/Chunk.java
-+++ b/src/main/java/org/bukkit/Chunk.java
-@@ -168,4 +168,20 @@ public interface Chunk {
-      * @return true if slimes are able to spawn in this chunk
-      */
-     boolean isSlimeChunk();
-+
-+    // Paper start - Force-Loaded Chunk API
-+    /**
-+     * Checks if the chunk is currently force-loaded
-+     *
-+     * @return true if the chunk is force-loaded, otherwise false
-+     */
-+    boolean isForceLoaded();
-+
-+    /**
-+     * Set's whether a chunk is force-loaded or not
-+     *
-+     * @param force whether or not to force load this chunk
-+     */
-+    void setForceLoaded(boolean force);
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index de89122e..aa28c452 100644
---- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -195,6 +195,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
-         return isChunkGenerated((int) chunkKey, (int) (chunkKey >> 32));
-     }
- 
-+    /**
-+     * Checks if a chunk is force-loaded.
-+     * Note: This will only return true if the chunk is also generated
-+     *
-+     * @param x X-coordinate of the chunk
-+     * @param z Z-coordinate of the chunk
-+     * @return true if the chunk is force-loaded. otherwise false
-+     */
-+    public boolean isChunkForceLoaded(int x, int z);
-+
-     /**
-      * This is the Legacy API before Java 8 was supported. Java 8 Consumer is provided,
-      * as well as future support
--- 
-2.19.1
-

Spigot-API-Patches/0145-Add-ray-tracing-methods-to-LivingEntity.patch

@@ -1,4 +1,4 @@
-From f7250d46b04c8d3ea217087c674301f006f92287 Mon Sep 17 00:00:00 2001
+From 797ddcb8d1d7aaa58ed9a7c7fb867158e932facc Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 3 Sep 2018 18:13:53 -0500
 Subject: [PATCH] Add ray tracing methods to LivingEntity
@@ -6,7 +6,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 diff --git a/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
 new file mode 100644
-index 000000000..fe43d9557
+index 00000000..fe43d955
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
 @@ -0,0 +1,50 @@
@@ -61,7 +61,7 @@ index 000000000..fe43d9557
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index e3bc04e1c..bd47e7209 100644
+index e3bc04e1..bd47e720 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -78,6 +78,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -143,5 +143,5 @@ index e3bc04e1c..bd47e7209 100644
       * Gets the last two blocks along the living entity's line of sight.
       * <p>
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0146-Expose-attack-cooldown-methods-for-Player.patch

@@ -1,11 +1,11 @@
-From fa58997c542e7d960489559b70bc4219db6dbd5c Mon Sep 17 00:00:00 2001
+From 288d6642d635afea38e19dfd087b11ddd00224c5 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:01:54 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c9f027f99..7f6ae5d16 100644
+index c9f027f9..7f6ae5d1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1907,6 +1907,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -36,5 +36,5 @@ index c9f027f99..7f6ae5d16 100644
  
      // Spigot start
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0147-Improve-death-events.patch

@@ -1,4 +1,4 @@
-From aef4c17d56b4333e03d4a071b0f3fd61a7c9bab8 Mon Sep 17 00:00:00 2001
+From 693483de100436c064845dd752f5f1ee987450fd Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:32:28 +0100
 Subject: [PATCH] Improve death events
@@ -173,5 +173,5 @@ index ab9e81fd..fef134c6 100644
 +    // Paper end
  }
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0148-Mob-Pathfinding-API.patch

@@ -1,4 +1,4 @@
-From 8287fe3f64b74ccd77c5b7e26d4ac557be8d8998 Mon Sep 17 00:00:00 2001
+From e56639fa55ad0e1d2a489c71c999dfba9aafda53 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 9 Sep 2018 12:39:06 -0400
 Subject: [PATCH] Mob Pathfinding API
@@ -13,7 +13,7 @@ You can use EntityPathfindEvent to cancel new pathfinds from overriding your cur
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java
 new file mode 100644
-index 000000000..d6953b390
+index 00000000..d6953b39
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java
 @@ -0,0 +1,167 @@
@@ -185,7 +185,7 @@ index 000000000..d6953b390
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
-index d029d34ea..48eddcd30 100644
+index d029d34e..48eddcd3 100644
 --- a/src/main/java/org/bukkit/entity/Mob.java
 +++ b/src/main/java/org/bukkit/entity/Mob.java
 @@ -7,6 +7,14 @@ import org.bukkit.loot.Lootable;
@@ -204,5 +204,5 @@ index d029d34ea..48eddcd30 100644
       * Instructs this Mob to set the specified LivingEntity as its target.
       * <p>
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch

@@ -1,4 +1,4 @@
-From ceef7057702a9be623ecad7664d826ab2516bd0e Mon Sep 17 00:00:00 2001
+From 830ac878de07dc95bcef19e838d0d5bf78986b47 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 12 Sep 2018 18:53:35 +0300
 Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values
@@ -217,7 +217,7 @@ index fe8d3468..074769c1 100644
          return key;
      }
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index df51f3ca..e9f640fb 100644
+index 4d0351c4..03e3cfd4 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 @@ -82,13 +82,13 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {
@@ -245,7 +245,7 @@ index df51f3ca..e9f640fb 100644
       * Returns an empty map if none.
       *
       * @return An immutable copy of the enchantments
-@@ -365,4 +365,83 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {
+@@ -363,4 +363,83 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {
  
      Spigot spigot();
      // Spigot end
@@ -330,5 +330,5 @@ index df51f3ca..e9f640fb 100644
 +    // Paper end
  }
 -- 
-2.19.2
+2.20.1
 

Spigot-API-Patches/0150-Performance-Concurrency-Improvements-to-Permissions.patch

@@ -1,4 +1,4 @@
-From 8cc83558c69d808807f58f7fd8986921a4bf285c Mon Sep 17 00:00:00 2001
+From 64ae4c1416201184004acc97e8973c304b5382e7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 13 Sep 2018 20:51:50 -0400
 Subject: [PATCH] Performance & Concurrency Improvements to Permissions
@@ -18,7 +18,7 @@ Optimized it to simply be a single get call cutting permission map
 lookups in half.
 
 diff --git a/src/main/java/org/bukkit/permissions/PermissibleBase.java b/src/main/java/org/bukkit/permissions/PermissibleBase.java
-index d4cb00a82..486f69f86 100644
+index d4cb00a8..486f69f8 100644
 --- a/src/main/java/org/bukkit/permissions/PermissibleBase.java
 +++ b/src/main/java/org/bukkit/permissions/PermissibleBase.java
 @@ -68,8 +68,11 @@ public class PermissibleBase implements Permissible {
@@ -110,5 +110,5 @@ index d4cb00a82..486f69f86 100644
      }
  
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0151-Add-ItemStackRecipeChoice-Draft-API.patch

@@ -1,4 +1,4 @@
-From e76b659f5e22697dc759adffd8ed7d470cc020a2 Mon Sep 17 00:00:00 2001
+From b40f077ca0c583d5bd25b14c8ecd7e3eed96b4be Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 13 Sep 2018 21:39:26 -0400
 Subject: [PATCH] Add ItemStackRecipeChoice Draft API
@@ -9,7 +9,7 @@ Allows creating recipes that must match isSimilar to full item stack.
 
 diff --git a/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
 new file mode 100644
-index 000000000..43e6576b1
+index 00000000..43e6576b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
 @@ -0,0 +1,51 @@
@@ -65,5 +65,5 @@ index 000000000..43e6576b1
 +    }
 +}
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0152-Implement-furnace-cook-speed-multiplier-API.patch

@@ -1,4 +1,4 @@
-From 85d81decb16af5bacff8ec75be26f94d1c81b5fa Mon Sep 17 00:00:00 2001
+From cb8dd2ae05fdc76057c79ecd8936954fd812a9e1 Mon Sep 17 00:00:00 2001
 From: Tassu <git@tassu.me>
 Date: Thu, 13 Sep 2018 08:45:01 +0300
 Subject: [PATCH] Implement furnace cook speed multiplier API

Spigot-API-Patches/0153-PreSpawnerSpawnEvent.patch

@@ -1,4 +1,4 @@
-From 32a60bd35059c35a3e7d359a37400769b93c6e31 Mon Sep 17 00:00:00 2001
+From 03de4ff3ffc69cd1597f223ab8154466131f3283 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 18 Sep 2018 23:50:10 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent
@@ -10,7 +10,7 @@ spawners.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java
 new file mode 100644
-index 000000000..d72212105
+index 00000000..d7221210
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java
 @@ -0,0 +1,27 @@
@@ -42,5 +42,5 @@ index 000000000..d72212105
 +    }
 +}
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0154-Remove-Precondition-on-name-for-AttributeModifier.patch

@@ -1,4 +1,4 @@
-From 7a42dca8e149969ed13cdae48a9cdf98262a3319 Mon Sep 17 00:00:00 2001
+From beb196480c0a50f244dfbc99d7d8f8f8f9123e03 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 22 Sep 2018 18:41:01 -0400
 Subject: [PATCH] Remove Precondition on name for AttributeModifier
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove Precondition on name for AttributeModifier
 Vanilla allows empty names
 
 diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java
-index 2bc9878ff..0943eee46 100644
+index 2bc9878f..0943eee4 100644
 --- a/src/main/java/org/bukkit/attribute/AttributeModifier.java
 +++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java
 @@ -30,10 +30,10 @@ public class AttributeModifier implements ConfigurationSerializable {
@@ -23,5 +23,5 @@ index 2bc9878ff..0943eee46 100644
          this.operation = operation;
          this.slot = slot;
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0155-Material-API-additions.patch

@@ -1,11 +1,11 @@
-From 36f2224286f0b66b0230f0ad4cfd914c603d8488 Mon Sep 17 00:00:00 2001
+From 9f8161e612c20011aefaab900ee328d011344ce7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 6 Oct 2018 21:14:29 -0400
 Subject: [PATCH] Material API additions
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 14cae61fb..393024343 100644
+index 14cae61f..39302434 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -72,6 +72,7 @@ import org.bukkit.material.MaterialData;
@@ -40,5 +40,5 @@ index 14cae61fb..393024343 100644
       * Do not use for any reason.
       *
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0156-Add-Material-Tags.patch

@@ -1,4 +1,4 @@
-From 340d4255fde17caa3dff4eed9f2c63aab197f877 Mon Sep 17 00:00:00 2001
+From add76949997b755d73d123817b65e0551d58f6b3 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,7 +8,7 @@ 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 000000000..b4f78e075
+index 00000000..b4f78e07
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java
 @@ -0,0 +1,139 @@
@@ -153,7 +153,7 @@ index 000000000..b4f78e075
 +}
 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 000000000..7a48445da
+index 00000000..7a48445d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java
 @@ -0,0 +1,377 @@
@@ -536,7 +536,7 @@ index 000000000..7a48445da
 +}
 diff --git a/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java
 new file mode 100644
-index 000000000..328c51471
+index 00000000..328c5147
 --- /dev/null
 +++ b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java
 @@ -0,0 +1,25 @@
@@ -566,7 +566,7 @@ index 000000000..328c51471
 +    }
 +}
 diff --git a/src/test/java/org/bukkit/TestServer.java b/src/test/java/org/bukkit/TestServer.java
-index 2d8403206..613675c3b 100644
+index 2d840320..613675c3 100644
 --- a/src/test/java/org/bukkit/TestServer.java
 +++ b/src/test/java/org/bukkit/TestServer.java
 @@ -30,6 +30,16 @@ public class TestServer implements InvocationHandler {
@@ -587,5 +587,5 @@ index 2d8403206..613675c3b 100644
                      Server.class.getMethod("getPluginManager"),
                      new MethodHandler() {
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0157-Allow-setting-the-vex-s-summoner.patch

@@ -1,4 +1,4 @@
-From 1b3e6a9e6dba9df96c4080e4bbcb5afe9466637c Mon Sep 17 00:00:00 2001
+From 58c627929f89adfa0b2353bd1d9e01984e462b03 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 21:47:09 -0500
 Subject: [PATCH] Allow setting the vex's summoner
@@ -30,5 +30,5 @@ index d395e405..78f0082e 100644
 +    // Paper end
  }
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0158-Add-LivingEntity-getTargetEntity.patch

@@ -1,4 +1,4 @@
-From 4b568e4b100ab191c511089dd45114dee7e1c7b8 Mon Sep 17 00:00:00 2001
+From c3cd722b840b3e0a65f7592c33897c9b9dee852c Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:32:53 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity
@@ -6,7 +6,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
 new file mode 100644
-index 000000000..5df8eed23
+index 00000000..5df8eed2
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
 @@ -0,0 +1,35 @@
@@ -46,7 +46,7 @@ index 000000000..5df8eed23
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index bd47e7209..34a8fe3f7 100644
+index bd47e720..34a8fe3f 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -147,6 +147,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -101,5 +101,5 @@ index bd47e7209..34a8fe3f7 100644
  
      /**
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0159-Add-sun-related-API.patch

@@ -1,14 +1,14 @@
-From 09dee3bad3aecdc375e9059a0679536b3dc2a23b Mon Sep 17 00:00:00 2001
+From 57018093cd49e64641888299c3c0645fe7d157e3 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:15 -0500
 Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index aa28c452..27e58136 100644
+index 668c9b7a..67e062b8 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1423,6 +1423,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1446,6 +1446,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public void setFullTime(long time);
  
@@ -44,5 +44,5 @@ index 48eddcd3..1b108a4a 100644
  
      /**
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0160-Here-s-Johnny.patch

@@ -1,4 +1,4 @@
-From 11cd00a4ed9f1c168842b3fe90c2a16c07241e1f Mon Sep 17 00:00:00 2001
+From ce30c5582810d5202d0a72af02321e2a0ee1420c Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 01:37:16 -0500
 Subject: [PATCH] Here's Johnny!
@@ -41,5 +41,5 @@ index b8ea68a8..c5d9e76a 100644
 +    // Paper end
 +}
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0161-Turtle-API.patch

@@ -1,4 +1,4 @@
-From 2b4c99b420dceb1f6c57d19416ba20d1eee8005b Mon Sep 17 00:00:00 2001
+From 853b766f604c2846ccace37753d58df97c8834b1 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 28 Sep 2018 17:08:09 -0500
 Subject: [PATCH] Turtle API
@@ -6,7 +6,7 @@ Subject: [PATCH] Turtle API
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java
 new file mode 100644
-index 000000000..11248ee93
+index 00000000..11248ee9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java
 @@ -0,0 +1,45 @@
@@ -57,7 +57,7 @@ index 000000000..11248ee93
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
 new file mode 100644
-index 000000000..7cb00f78d
+index 00000000..7cb00f78
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
 @@ -0,0 +1,81 @@
@@ -144,7 +144,7 @@ index 000000000..7cb00f78d
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java
 new file mode 100644
-index 000000000..5d53ee08b
+index 00000000..5d53ee08
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java
 @@ -0,0 +1,57 @@
@@ -206,7 +206,7 @@ index 000000000..5d53ee08b
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Turtle.java b/src/main/java/org/bukkit/entity/Turtle.java
-index 0a4cd2993..e547eead4 100644
+index 0a4cd299..e547eead 100644
 --- a/src/main/java/org/bukkit/entity/Turtle.java
 +++ b/src/main/java/org/bukkit/entity/Turtle.java
 @@ -1,6 +1,53 @@
@@ -265,5 +265,5 @@ index 0a4cd2993..e547eead4 100644
 +    // Paper end
 +}
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0162-Implement-getters-and-setters-for-EntityItem-owner-a.patch

@@ -1,4 +1,4 @@
-From 9848837a4d460976eaaa3643870f52c3f3ecc95c Mon Sep 17 00:00:00 2001
+From 2c380e9b76d24bea7deef42af4e95bcf6e3fec2a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 20:54:13 -0500
 Subject: [PATCH] Implement getters and setters for EntityItem owner and
@@ -58,5 +58,5 @@ index 2e98e4f9..8049b36c 100644
      // Paper end
  }
 -- 
-2.19.0
+2.20.1
 

Spigot-API-Patches/0163-Add-spectator-target-events.patch

@@ -1,4 +1,4 @@
-From 44a47707ed4cc9e39a4e054061e8b58c6eb02790 Mon Sep 17 00:00:00 2001
+From fb900dc1cd53f7634e16210beac32550300cfc85 Mon Sep 17 00:00:00 2001
 From: Caleb Bassham <caleb.bassham@gmail.com>
 Date: Fri, 28 Sep 2018 02:30:56 -0500
 Subject: [PATCH] Add spectator target events
@@ -131,5 +131,5 @@ index 00000000..ce23caaf
 +    }
 +}
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0164-Add-more-Witch-API.patch

@@ -1,11 +1,11 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 3df85d0e4c57460cf7644e4acd0a42ce53bd05f6 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 03:47:26 -0500
 Subject: [PATCH] Add more Witch API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 4b27f689..64ec8409 100644
 --- a/src/main/java/org/bukkit/entity/Witch.java
 +++ b/src/main/java/org/bukkit/entity/Witch.java
 @@ -2,8 +2,42 @@ package org.bukkit.entity;
@@ -53,5 +53,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
 +    // Paper end
  }
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch

@@ -1,11 +1,11 @@
-From f8b5db1f226e671fc1fd422e4723eb8eaa70eddc Mon Sep 17 00:00:00 2001
+From 7a729003770c77b436b94759d729f350a35ab14e 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 233a71540..22ca2900c 100644
+index 233a7154..22ca2900 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1463,6 +1463,14 @@ public final class Bukkit {
@@ -24,7 +24,7 @@ index 233a71540..22ca2900c 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 b8076fc3f..9c78f18f6 100644
+index b8076fc3..9c78f18f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1265,6 +1265,12 @@ public interface Server extends PluginMessageRecipient {
@@ -41,7 +41,7 @@ index b8076fc3f..9c78f18f6 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 4a479627d..77171cd17 100644
+index 4a479627..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 {
@@ -54,5 +54,5 @@ index 4a479627d..77171cd17 100644
              for (String line : permissionMessage.replace("<permission>", permission).split("\n")) {
                  target.sendMessage(line);
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch

@@ -1,4 +1,4 @@
-From 9cc1d43c347c163357f283529d7fd0a9cefb5474 Mon Sep 17 00:00:00 2001
+From f09172180ea930533e2dfb629a6cd104ba613df4 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 15:53:43 +0000
 Subject: [PATCH] Support cancellation supression of EntityDismount/VehicleExit
@@ -108,5 +108,5 @@ index 4110d3bb..555899ef 100644
      public HandlerList getHandlers()
      {
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0167-Add-more-Zombie-API.patch

@@ -1,4 +1,4 @@
-From 8fc89f6aa5cd95b3b784cefd12a6e7e4bd4db165 Mon Sep 17 00:00:00 2001
+From 565b1a1d7031594461aa7fac5a6a63eb1ff7f803 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 04:29:51 -0500
 Subject: [PATCH] Add more Zombie API
@@ -65,5 +65,5 @@ index 48034198..615dd990 100644
 +    // Paper end
  }
 -- 
-2.20.0
+2.20.1
 

Spigot-API-Patches/0168-Change-the-reserved-channel-check-to-be-sensible.patch

@@ -1,4 +1,4 @@
-From eb7842870179959eb5cec665ae4e51cda37da706 Mon Sep 17 00:00:00 2001
+From c607e328655c95d9773323d6c79c5e544ee27fe7 Mon Sep 17 00:00:00 2001
 From: DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com>
 Date: Tue, 23 Oct 2018 19:32:55 +0300
 Subject: [PATCH] Change the reserved channel check to be sensible
@@ -33,5 +33,5 @@ index c15fa003..31ff2f61 100644
      }
  
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0169-Add-PlayerConnectionCloseEvent.patch

@@ -1,4 +1,4 @@
-From c82f656c16764f1c42045bc102ad89c43d43a1db Mon Sep 17 00:00:00 2001
+From f0efe7dcddc56cd20983c541c42537f1d78f7b0b Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 7 Oct 2018 12:05:06 -0700
 Subject: [PATCH] Add PlayerConnectionCloseEvent
@@ -129,5 +129,5 @@ index 00000000..80896bbf
 +    }
 +}
 -- 
-2.20.0
+2.20.1