Unwrap Event Exceptions

This was a useless exception wrapper that ends up making
stack traces harder to read as well as the JVM cutting off
the important parts

Nothing catches this exception, so its safe to just get rid
of it and let the REAL exception bubble down

Spigot-API-Patches/0003-Paper-Utils.patch

@@ -0,0 +1,29 @@
+From d7927f758fcbaeb1c2bf4fa4debed90eb6f04991 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Sat, 23 Feb 2019 11:26:21 -0500
+Subject: [PATCH] Paper Utils
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java
+new file mode 100644
+index 00000000..e5850967
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java
+@@ -0,0 +1,14 @@
++package com.destroystokyo.paper.util;
++
++public class SneakyThrow {
++
++    public static void sneaky(Throwable exception) {
++        SneakyThrow.<RuntimeException>throwSneaky(exception);
++    }
++
++    @SuppressWarnings("unchecked")
++    private static <T extends Throwable> void throwSneaky(Throwable exception) throws T {
++        throw (T) exception;
++    }
++
++}
+-- 
+2.20.1
+

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

@@ -1,4 +1,4 @@
-From c4e6bfe0af9a90f66cf6685af9e00d904a817b2d Mon Sep 17 00:00:00 2001
+From 3bb80307cfe675a18922158a1d2b1427e334a27b 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

Spigot-API-Patches/0005-Player-affects-spawning-API.patch

@@ -1,4 +1,4 @@
-From 7ca40bb76fccf892bb8ead4ba9433e5914e8d693 Mon Sep 17 00:00:00 2001
+From 44c7da0daea1759a7b45d8e5393ca84216ed9c0a Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Mon, 29 Feb 2016 17:22:34 -0600
 Subject: [PATCH] Player affects spawning API

Spigot-API-Patches/0006-Add-getTPS-method.patch

@@ -1,11 +1,11 @@
-From 2d46f80ca7111d829da20a036e72c27aaa6cd253 Mon Sep 17 00:00:00 2001
+From 55f158cbeaa2938c3bc32d50ddd023ab6a172f67 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 17:24:57 -0600
 Subject: [PATCH] Add getTPS method
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 52ce3cd4..8a6529f3 100644
+index 14e425d1..6055c801 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1274,6 +1274,16 @@ public final class Bukkit {
@@ -26,7 +26,7 @@ index 52ce3cd4..8a6529f3 100644
       * Get the advancement specified by this key.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6572f3ac..9651a45c 100644
+index 9d2326ca..1632af18 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1056,6 +1056,15 @@ public interface Server extends PluginMessageRecipient {

Spigot-API-Patches/0007-Entity-Origin-API.patch

@@ -1,4 +1,4 @@
-From 37ea574289bb7d3eaae4045a22c9bbc07ecd7672 Mon Sep 17 00:00:00 2001
+From ac7b32c1796b75c604e78cde4e691fbf4611df50 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 17:50:31 -0600
 Subject: [PATCH] Entity Origin API

Spigot-API-Patches/0008-Check-Paper-versions.patch

@@ -1,11 +1,11 @@
-From 121fabf8e1502b935c8d3f94635247b6d369de24 Mon Sep 17 00:00:00 2001
+From 33f3804404e0c186f8cf33f8f3a226e0d84b7dfc Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 17:58:01 -0600
 Subject: [PATCH] Check Paper versions
 
 
 diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index 5a994953b..f38f68640 100644
+index 5a994953..f38f6864 100644
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 @@ -26,6 +26,11 @@ import org.json.simple.JSONObject;
@@ -147,5 +147,5 @@ index 5a994953b..f38f68640 100644
 +    // Paper end
  }
 -- 
-2.19.1
+2.20.1
 

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

@@ -1,4 +1,4 @@
-From 6a8a468f3a3b613765b95dea08c1a426bf7cc379 Mon Sep 17 00:00:00 2001
+From 4a87891b85650f57eb21334774f829ae8ba4c5e0 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

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

@@ -1,4 +1,4 @@
-From 5909d262fd56ae7bbc35af5e26f109f8c60a17a1 Mon Sep 17 00:00:00 2001
+From e802df27e5944819165eb81c78b5c6e4842a15dd 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

Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch

@@ -1,4 +1,4 @@
-From b0d2313841c2f617773d33708aaca8fece34d75c Mon Sep 17 00:00:00 2001
+From 41cb3feff77a6e684cefbc546f48245294a2d978 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 18:09:40 -0600
 Subject: [PATCH] Add BeaconEffectEvent
@@ -92,5 +92,5 @@ index 00000000..6579ae99
 +    }
 +}
 -- 
-2.17.0 (Apple Git-106)
+2.20.1
 

Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch

@@ -1,4 +1,4 @@
-From facd6dc1bbfc8a8f13398666f37d86892ce761cc Mon Sep 17 00:00:00 2001
+From 31ed8767255c5f82dbb149e44a080e17a52d7f29 Mon Sep 17 00:00:00 2001
 From: Steve Anton <anxuiz.nx@gmail.com>
 Date: Mon, 29 Feb 2016 18:13:58 -0600
 Subject: [PATCH] Add PlayerInitialSpawnEvent
@@ -55,5 +55,5 @@ index 00000000..d1d6f33c
 +    }
 +}
 -- 
-2.18.0
+2.20.1
 

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

@@ -1,4 +1,4 @@
-From b45f9dba0fc2d0d9839d30d4724b86047a8a9e2a Mon Sep 17 00:00:00 2001
+From 022b86144f12f59ec72a1d51aa364d1dfecd590f 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

Spigot-API-Patches/0014-Expose-server-CommandMap.patch

@@ -1,4 +1,4 @@
-From 1aea2e6ad04b50f18e972f4b30a3f2855b6108eb Mon Sep 17 00:00:00 2001
+From 1810c82d5d0939592b9bd28dff43af08b9913578 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Mon, 29 Feb 2016 19:48:59 -0600
 Subject: [PATCH] Expose server CommandMap

Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch

@@ -1,4 +1,4 @@
-From 70541080fa91240503bba54632ebddfba554c439 Mon Sep 17 00:00:00 2001
+From fb9cdc4061e67e97aa4bb394408fa0ed58d5980d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 19:54:32 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
@@ -6,7 +6,7 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
 Change Javadoc to be accurate
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d4b7c539..f14339af 100644
+index cb7dc068..22704949 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -289,6 +289,26 @@ public final class Bukkit {
@@ -37,7 +37,7 @@ index d4b7c539..f14339af 100644
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b9a75b2d..ce369aa3 100644
+index c4dc1de2..f4f4f291 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -237,6 +237,26 @@ public interface Server extends PluginMessageRecipient {

Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch

@@ -1,4 +1,4 @@
-From 5ce4dce9f8fb84d51fb88716b3d48ae1ba77e9ce Mon Sep 17 00:00:00 2001
+From 4a3c14108319be72d10d723765208489faeade93 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 29 Feb 2016 20:02:40 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -6,7 +6,7 @@ Subject: [PATCH] Player Tab List and Title APIs
 
 diff --git a/src/main/java/com/destroystokyo/paper/Title.java b/src/main/java/com/destroystokyo/paper/Title.java
 new file mode 100644
-index 000000000..3c2b63db4
+index 00000000..3c2b63db
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/Title.java
 @@ -0,0 +1,358 @@
@@ -369,7 +369,7 @@ index 000000000..3c2b63db4
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index fc2d4da89..b57b6981d 100644
+index bf86eb67..959add05 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2,6 +2,7 @@ package org.bukkit.entity;
@@ -498,5 +498,5 @@ index fc2d4da89..b57b6981d 100644
  
      /**
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0017-Add-exception-reporting-event.patch

@@ -1,4 +1,4 @@
-From 89163d1e8bdffcb4edd56ad2285ce58bf5852f01 Mon Sep 17 00:00:00 2001
+From e2ae8da9f75fcb1125eb4b5d155f87c10402abdc Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 20:24:35 -0600
 Subject: [PATCH] Add exception reporting event

Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch

@@ -1,4 +1,4 @@
-From cb1afe86f6ab48949d4e19d3549a4669b1ceae28 Mon Sep 17 00:00:00 2001
+From 53967b181e239d26686641531567dd5ca810eaef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 20:26:39 -0600
 Subject: [PATCH] Fix ServerListPingEvent flagging as Async
@@ -50,5 +50,5 @@ index 343f238f..3c38d857 100644
          this.address = address;
          this.motd = motd;
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch

@@ -1,11 +1,11 @@
-From 4f2293cad7b7ebfdea3f2d98d6de482f59bc9fff Mon Sep 17 00:00:00 2001
+From 325fb41de3f83292cb643328dca9fe1cf88a4285 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 13:05:59 -0800
 Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
 
 
 diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
-index abf68a2c7..fcb03b830 100644
+index abf68a2c..fcb03b83 100644
 --- a/src/main/java/org/bukkit/command/CommandSender.java
 +++ b/src/main/java/org/bukkit/command/CommandSender.java
 @@ -58,4 +58,30 @@ public interface CommandSender extends Permissible {
@@ -40,7 +40,7 @@ index abf68a2c7..fcb03b830 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b57b6981d..2096656ee 100644
+index 959add05..5109a0c3 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -421,6 +421,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -60,5 +60,5 @@ index b57b6981d..2096656ee 100644
          spigot().sendMessage(components);
      }
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -1,11 +1,11 @@
-From 6608ee077047ceaa21424db91fcc3140555ac72c Mon Sep 17 00:00:00 2001
+From b7ed9b6398099edd1abbd197e97f6ccd0f3bf446 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:47:27 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 8cf98673d..f67711fd7 100644
+index 8cf98673..f67711fd 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -453,4 +453,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -29,5 +29,5 @@ index 8cf98673d..f67711fd7 100644
 +    // Paper end
  }
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0021-Complete-resource-pack-API.patch

@@ -1,4 +1,4 @@
-From bb7b7a5e39dd260604c73a219f275c3982f012a3 Mon Sep 17 00:00:00 2001
+From 84cb83edc3529a5d89c634cf92d88e36ea7b051a Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 22:59:54 -0400
 Subject: [PATCH] Complete resource pack API

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

@@ -1,4 +1,4 @@
-From dd5c7d73e74b48760f58cee1810cb23f3c9a4352 Mon Sep 17 00:00:00 2001
+From c3ff7d3fbb2e568bfc8c25a3c3f0857e73c2c184 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 f8f12595b..84ba2076f 100644
+index f8f12595..84ba2076 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -116,6 +116,17 @@
@@ -29,7 +29,7 @@ index f8f12595b..84ba2076f 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,10 +75,10 @@ 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..bac04fd8
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
-@@ -0,0 +1,39 @@
+@@ -0,0 +1,41 @@
 +package com.destroystokyo.paper.event.executor;
 +
 +import java.lang.invoke.MethodHandle;
@@ -86,8 +86,10 @@ index 000000000..f60f01005
 +import java.lang.reflect.Method;
 +import java.lang.reflect.Modifier;
 +
++import com.destroystokyo.paper.util.SneakyThrow;
 +import com.google.common.base.Preconditions;
 +
++import org.bukkit.Bukkit;
 +import org.bukkit.event.Event;
 +import org.bukkit.event.EventException;
 +import org.bukkit.event.Listener;
@@ -113,14 +115,14 @@ index 000000000..f60f01005
 +        if (!eventClass.isInstance(event)) return;
 +        try {
 +            handle.invoke(event);
-+        } catch (Throwable t) {
-+            throw new EventException(t);
++        } catch (Throwable throwable) {
++            SneakyThrow.sneaky(throwable);
 +        }
 +    }
 +}
 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 +172,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 +210,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 +279,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,10 +317,10 @@ 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..b11c6ce6 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;
+@@ -4,9 +4,74 @@ import org.bukkit.event.Event;
  import org.bukkit.event.EventException;
  import org.bukkit.event.Listener;
  
@@ -380,16 +382,9 @@ index 3b2c99ea7..b45b6c1c3 100644
 +            try {
 +                EventExecutor asmExecutor = executorClass.newInstance();
 +                // Define a wrapper to conform to bukkit stupidity (passing in events that don't match and wrapper exception)
-+                return new EventExecutor() {
-+                    @Override
-+                    public void execute(Listener listener, Event event) throws EventException {
++                return (listener, event) -> {
 +                    if (!eventClass.isInstance(event)) return;
-+                        try {
 +                    asmExecutor.execute(listener, event);
-+                        } catch (Exception e) {
-+                            throw new EventException(e);
-+                        }
-+                    }
 +                };
 +            } catch (InstantiationException | IllegalAccessException e) {
 +                throw new AssertionError("Unable to initialize generated event executor", e);
@@ -401,7 +396,7 @@ 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 bf9723029..77207f147 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
 @@ -290,20 +290,7 @@ public final class JavaPluginLoader implements PluginLoader {

Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch

@@ -1,4 +1,4 @@
-From b6c1b5a967f036414fecc13493846b18a6c60ffe Mon Sep 17 00:00:00 2001
+From 39a9d269c567db7d72040f7bd62befb4c4a09482 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 19 May 2013 20:36:58 -0400
 Subject: [PATCH] Add a call helper to Event
@@ -40,5 +40,5 @@ index 6677e1bd..e7061112 100644
       * Convenience method for providing a user-friendly identifier. By
       * default, it is the event's class's {@linkplain Class#getSimpleName()
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch

@@ -1,4 +1,4 @@
-From 77a78428fcc16fb82c0a2e0d2173db22a1476266 Mon Sep 17 00:00:00 2001
+From 01aa5305d302cfcdfdd2fb0ba3726cf5f3e7f8cd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 22 Jul 2015 18:50:41 -0400
 Subject: [PATCH] Add sender name to commands.yml replacement
@@ -42,5 +42,5 @@ index 9c80f464..631be1cb 100644
          while (index != -1) {
              int start = index;
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch

@@ -1,4 +1,4 @@
-From 04ea5b0483635c527ce9f0c79508b1f173e020c8 Mon Sep 17 00:00:00 2001
+From 0e952a407295877a6c5dd1afc482fc75ef8ba8f9 Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:28:07 -0400
 Subject: [PATCH] Add command to reload permissions.yml and require confirm to

Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch

@@ -1,4 +1,4 @@
-From 9b4d4b26e75b1e6467c11da7432ba08453689686 Mon Sep 17 00:00:00 2001
+From ecd8d3e4642c78e5943717aed64df470aa7f83c9 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:05:21 -0400
 Subject: [PATCH] Custom replacement for eaten items
@@ -56,5 +56,5 @@ index 8ab76b1d..7d28155b 100644
          return this.isCancelled;
      }
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch

@@ -1,4 +1,4 @@
-From a7dfaaafcec3d730d94bbb597f2070accb79bf76 Mon Sep 17 00:00:00 2001
+From 1d864e4056e3e6dbfbdc8675781c0310b9215925 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:44:49 -0400
 Subject: [PATCH] Access items by EquipmentSlot
@@ -32,5 +32,5 @@ index fc5772e8..d56f6e00 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch

@@ -1,4 +1,4 @@
-From db294a56ff3cbb40493caea0ce0506dc6261de4d Mon Sep 17 00:00:00 2001
+From 317c71255861fe7a849577db4f289473425bd0d6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:26:34 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
@@ -72,5 +72,5 @@ index 00000000..800be6aa
 +    }
 +}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0029-EntityPathfindEvent.patch

@@ -1,4 +1,4 @@
-From 0f4f69d6a81d66c4906f1c05cac664bbdb129cf7 Mon Sep 17 00:00:00 2001
+From b9ed451873b6f1026308d423f636604f07fcf31c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:15:34 -0400
 Subject: [PATCH] EntityPathfindEvent
@@ -86,5 +86,5 @@ index 00000000..0e4902d9
 +    }
 +}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch

@@ -1,4 +1,4 @@
-From 9cd7b0f5a8832c7d1b3db973c9f65db555013762 Mon Sep 17 00:00:00 2001
+From 6c27ed542ca4cd73af3d8ae98f29511c827003f3 Mon Sep 17 00:00:00 2001
 From: crast <contact@jamescrasta.com>
 Date: Sat, 1 Jun 2013 13:52:30 -0600
 Subject: [PATCH] Reduce thread synchronization in MetadataStoreBase
@@ -101,5 +101,5 @@ index 093c1445..64c0f0a7 100644
          for (Map<Plugin, MetadataValue> values : metadataMap.values()) {
              if (values.containsKey(owningPlugin)) {
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch

@@ -1,4 +1,4 @@
-From 9a9ae4bff73c2649084dc753efa60f86ac91c2dd Mon Sep 17 00:00:00 2001
+From 28cef08075786587ecc702ad3dab4bc06d3ce624 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 16 Jul 2013 21:26:50 -0400
 Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin)
@@ -37,5 +37,5 @@ index 64c0f0a7..6da6abd8 100644
       * Creates a unique name for the object receiving metadata by combining
       * unique data from the subject with a metadataKey.
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch

@@ -1,4 +1,4 @@
-From 57f2ba957f3cf3753fdf4f51697cda7e52daefc7 Mon Sep 17 00:00:00 2001
+From 0e2bcd42ff189af6160bf962e5c8371b067d9cd9 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:08:36 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@@ -53,5 +53,5 @@ index 00000000..70eeaf5c
 +    }
 +}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch

@@ -1,4 +1,4 @@
-From ee3ad1b0cf85252211cdb2811557bfb7da695370 Mon Sep 17 00:00:00 2001
+From 9cab068579819105524d58de846e54b9a4050bb2 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:20:18 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
@@ -223,5 +223,5 @@ index 00000000..e44d03a2
 +    }
 +}
 -- 
-2.19.1
+2.20.1
 

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

@@ -1,4 +1,4 @@
-From e711715c7ddc2a309bbcb0156ab188fb95fddd32 Mon Sep 17 00:00:00 2001
+From 14622209c86028ac63d81543497dfa48290ba377 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

Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch

@@ -1,11 +1,11 @@
-From 230d52bcaba8bbb8dafe803bb5fb6b26554abb1e Mon Sep 17 00:00:00 2001
+From 927a3bee043bc15d1c0c0f60be3e4afb3f440ab6 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
-index 976b80b7e..a5ac3edf3 100644
+index 976b80b7..a5ac3edf 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
 @@ -12,12 +12,31 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable
@@ -41,5 +41,5 @@ index 976b80b7e..a5ac3edf3 100644
      /**
       * Gets the amount of regained health
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0036-LootTable-API.patch

@@ -1,4 +1,4 @@
-From d1fe144a1457bb44d3e453bf5add1a93aea47d4a Mon Sep 17 00:00:00 2001
+From 8c74a2e04e4a744068d564312cd647bc53898a59 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 15:19:49 -0400
 Subject: [PATCH] LootTable API
@@ -12,7 +12,7 @@ Provides methods to determine players looted state for an object
 
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java
 new file mode 100644
-index 000000000..9095df616
+index 00000000..9095df61
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java
 @@ -0,0 +1,15 @@
@@ -33,7 +33,7 @@ index 000000000..9095df616
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java
 new file mode 100644
-index 000000000..a389f74c6
+index 00000000..a389f74c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java
 @@ -0,0 +1,15 @@
@@ -54,7 +54,7 @@ index 000000000..a389f74c6
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
 new file mode 100644
-index 000000000..2fc3e8a1c
+index 00000000..2fc3e8a1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
 @@ -0,0 +1,112 @@
@@ -172,7 +172,7 @@ index 000000000..2fc3e8a1c
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
 new file mode 100644
-index 000000000..2169493d9
+index 00000000..2169493d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
 @@ -0,0 +1,41 @@
@@ -218,7 +218,7 @@ index 000000000..2169493d9
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java
-index 815d79a53..b68ab881d 100644
+index 815d79a5..b68ab881 100644
 --- a/src/main/java/org/bukkit/block/Chest.java
 +++ b/src/main/java/org/bukkit/block/Chest.java
 @@ -1,5 +1,6 @@
@@ -238,7 +238,7 @@ index 815d79a53..b68ab881d 100644
      /**
       * Gets the inventory of the chest block represented by this block state.
 diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java
-index 2741625db..6d180117e 100644
+index 2741625d..6d180117 100644
 --- a/src/main/java/org/bukkit/block/Dispenser.java
 +++ b/src/main/java/org/bukkit/block/Dispenser.java
 @@ -1,5 +1,6 @@
@@ -258,7 +258,7 @@ index 2741625db..6d180117e 100644
      /**
       * Gets the BlockProjectileSource object for the dispenser.
 diff --git a/src/main/java/org/bukkit/block/Dropper.java b/src/main/java/org/bukkit/block/Dropper.java
-index 2e8c3f711..47737b590 100644
+index 2e8c3f71..47737b59 100644
 --- a/src/main/java/org/bukkit/block/Dropper.java
 +++ b/src/main/java/org/bukkit/block/Dropper.java
 @@ -1,12 +1,13 @@
@@ -277,7 +277,7 @@ index 2e8c3f711..47737b590 100644
      /**
       * Tries to drop a randomly selected item from the dropper's inventory,
 diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java
-index 73fce5f33..221123e8c 100644
+index 73fce5f3..221123e8 100644
 --- a/src/main/java/org/bukkit/block/Hopper.java
 +++ b/src/main/java/org/bukkit/block/Hopper.java
 @@ -1,9 +1,10 @@
@@ -293,7 +293,7 @@ index 73fce5f33..221123e8c 100644
 -public interface Hopper extends Container, Nameable, Lootable { }
 +public interface Hopper extends Container, Nameable, LootableBlockInventory { } // Paper
 diff --git a/src/main/java/org/bukkit/block/ShulkerBox.java b/src/main/java/org/bukkit/block/ShulkerBox.java
-index 8e061e4a4..1c02c6e1c 100644
+index 8e061e4a..1c02c6e1 100644
 --- a/src/main/java/org/bukkit/block/ShulkerBox.java
 +++ b/src/main/java/org/bukkit/block/ShulkerBox.java
 @@ -1,5 +1,6 @@
@@ -313,7 +313,7 @@ index 8e061e4a4..1c02c6e1c 100644
      /**
       * Get the {@link DyeColor} corresponding to this ShulkerBox
 diff --git a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
-index 8ced54039..865885501 100644
+index 8ced5403..86588550 100644
 --- a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
 +++ b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
 @@ -1,5 +1,6 @@
@@ -333,7 +333,7 @@ index 8ced54039..865885501 100644
      /**
       * Checks whether or not this Minecart will pick up 
 diff --git a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
-index 9ea403e6f..238d118f7 100644
+index 9ea403e6..238d118f 100644
 --- a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
 +++ b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
 @@ -1,5 +1,6 @@
@@ -351,7 +351,7 @@ index 9ea403e6f..238d118f7 100644
 +public interface StorageMinecart extends Minecart, InventoryHolder, LootableEntityInventory { // Paper
  }
 diff --git a/src/main/java/org/bukkit/loot/Lootable.java b/src/main/java/org/bukkit/loot/Lootable.java
-index f4b3d0215..9f1c830f4 100644
+index f4b3d021..9f1c830f 100644
 --- a/src/main/java/org/bukkit/loot/Lootable.java
 +++ b/src/main/java/org/bukkit/loot/Lootable.java
 @@ -33,6 +33,34 @@ public interface Lootable {
@@ -390,5 +390,5 @@ index f4b3d0215..9f1c830f4 100644
       * Set the seed used when this Loot Table generates loot.
       *
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0037-Add-EntityZapEvent.patch

@@ -1,4 +1,4 @@
-From 2527eb4a36c059f3c42f5fc5dbac73c6021c6d10 Mon Sep 17 00:00:00 2001
+From a520009d4480e4b49846a57681d065a651c45419 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:34 -0700
 Subject: [PATCH] Add EntityZapEvent
@@ -120,5 +120,5 @@ index c1d4b30a..de8cad81 100644
 +    // Paper end
  }
 -- 
-2.19.2
+2.20.1
 

Spigot-API-Patches/0038-Misc-Utils.patch

@@ -1,4 +1,4 @@
-From f3a8ebcad45891f6cb7d243095d3739c1f1980d2 Mon Sep 17 00:00:00 2001
+From 3fabac75e83331f5b4ac0cefaa42b16441a2956e Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 12:53:43 -0500
 Subject: [PATCH] Misc Utils
@@ -42,5 +42,5 @@ index 00000000..d60ecbb1
 +    }
 +}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch

@@ -1,4 +1,4 @@
-From 305f8749b7972506665be9ad41cdaa5fb020e60f Mon Sep 17 00:00:00 2001
+From a7f30eb6aff66658a5731d0ee906374a2a823788 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:16:39 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases

Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch

@@ -1,4 +1,4 @@
-From 47a6be4ee58f0b7650ee3f74933311d0e0dbab0e Mon Sep 17 00:00:00 2001
+From 089130d865363f60ffce7794d8ba7080e9475a81 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:47:08 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
@@ -52,5 +52,5 @@ index f37491d7..30882559 100644
       * Get the amount of experience the player will receive
       *
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch

@@ -1,4 +1,4 @@
-From 4eac0975455ab0ef81f5dac6bf83d475951f9a81 Mon Sep 17 00:00:00 2001
+From 0d310faa3823420b08c8d77d29833c910e196c51 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
@@ -73,5 +73,5 @@ index 00000000..f42e9851
 +    }
 +}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch

@@ -1,4 +1,4 @@
-From 38f50835d8432bd0552c5fbeb5d53b3aa9aa42f6 Mon Sep 17 00:00:00 2001
+From 64e90092e25dfcb2093727229eabe28f667ee6aa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:55:55 -0500
 Subject: [PATCH] Add String based Action Bar API

Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch

@@ -1,4 +1,4 @@
-From 718a96c9c13faf9b22291e81c70b0170fd4a0501 Mon Sep 17 00:00:00 2001
+From c8592d0fed70ee265eb9bc9c2aa45cf3efacf890 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move
@@ -32,5 +32,5 @@ index b4f04517..099da6ce 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0044-IllegalPacketEvent.patch

@@ -1,4 +1,4 @@
-From 0f595a2260083d3940ed487003e0351bb75aa1a5 Mon Sep 17 00:00:00 2001
+From df9951c426373976f105802670f755706705761d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 4 Dec 2016 01:19:14 -0500
 Subject: [PATCH] IllegalPacketEvent
@@ -77,5 +77,5 @@ index 00000000..e11f74fc
 +    }
 +}
 -- 
-2.18.0
+2.20.1
 

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

@@ -1,4 +1,4 @@
-From e1ee48a404bc7e7c82193a91cc6fa36b1b46c364 Mon Sep 17 00:00:00 2001
+From 03c53cfd5436f75a613567236c4c97f9a0859497 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

Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch

@@ -1,4 +1,4 @@
-From 718717b647158518a34c36bb8e5623d838e88e29 Mon Sep 17 00:00:00 2001
+From b1cdd9cf910f3b9b6c0adb16d110a9f32b5fa87d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 20:29:33 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@@ -39,5 +39,5 @@ index 00000000..bdefbc9f
 +    }
 +}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch

@@ -1,4 +1,4 @@
-From 5a4ad7c25a554997a5d590629a529cd35f099366 Mon Sep 17 00:00:00 2001
+From fe9d5c94dc4df94951b626e28eeb13a0a4fbbeaa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:23:03 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 94647047..06bcee03 100644
+index d62277de..8a0f992f 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -28,6 +28,33 @@ import org.bukkit.util.Vector;
@@ -45,5 +45,5 @@ index 94647047..06bcee03 100644
       * Gets the {@link Block} at the given coordinates
       *
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch

@@ -1,4 +1,4 @@
-From a5987f0c76258d3d57fe1611b8355438ebbcc058 Mon Sep 17 00:00:00 2001
+From 0115c934227d7ae971e287367407bd7a72a186ba Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:28:32 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@@ -115,5 +115,5 @@ index c286edfd..f847543b 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch

@@ -1,4 +1,4 @@
-From 2938561e612928e665b3e9db9f50e44d5284970e Mon Sep 17 00:00:00 2001
+From bd7776459d0b309752fcdc6b0169ac8508a34989 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 21 Jan 2017 17:03:10 -0600
 Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check
@@ -28,5 +28,5 @@ index 4dc18edc..41b7fae6 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.20.1
 

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

@@ -1,4 +1,4 @@
-From d34bbb981986fda1507431108f1c315cdfd1c91d Mon Sep 17 00:00:00 2001
+From e8a0fcc32795014e18a8be640522fecddc8f4541 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

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

@@ -1,4 +1,4 @@
-From fd193171492260fcd83f90775fd3e47f68d01f5a Mon Sep 17 00:00:00 2001
+From 7c8eed2edc8e4783ed66f36cb206b95a1f3039de 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

Spigot-API-Patches/0052-Item-canEntityPickup.patch

@@ -1,4 +1,4 @@
-From 360118be75c9c955ddc56da1a41976f2238136af Mon Sep 17 00:00:00 2001
+From 717972d0fe8f0692924a0818c12d44f078ef63fc Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 5 May 2017 03:57:08 -0500
 Subject: [PATCH] Item#canEntityPickup
@@ -30,5 +30,5 @@ index 90260b7e..2e98e4f9 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch

@@ -1,4 +1,4 @@
-From 158701799346c25d8daf92beb3fb9c59922c3aec Mon Sep 17 00:00:00 2001
+From 7e146962920f6d97ea5d9505e4351731dda96483 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 May 2017 06:26:01 -0500
 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
@@ -52,5 +52,5 @@ index c76f423e..46c6d519 100644
  
      @Override
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch

@@ -1,4 +1,4 @@
-From b989dc1168c035e24f94e0ff25514d579e52f6f7 Mon Sep 17 00:00:00 2001
+From feb2578249055b5ea84eefea5352074314225f0d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 11 Jun 2017 16:30:37 -0500
 Subject: [PATCH] PlayerAttemptPickupItemEvent
@@ -96,5 +96,5 @@ index 00000000..480293e9
 +    }
 +}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch

@@ -1,4 +1,4 @@
-From 170f61cabc9f329e6a4159b4a9dc9db4a5d76836 Mon Sep 17 00:00:00 2001
+From 4c16ebe8f181e90a58c0d8546eec8bed09fbb5f7 Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:06 -0400
 Subject: [PATCH] Add UnknownCommandEvent
@@ -88,5 +88,5 @@ index 00000000..19d634c3
 +}
 +
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch

@@ -1,4 +1,4 @@
-From ba7ca826a69db5f365c35ebf7ea2f7834f8aaa7e Mon Sep 17 00:00:00 2001
+From 61c8f560cab2b9ca2664390d3284a22a9578d775 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 15 Jan 2018 21:46:46 -0500
 Subject: [PATCH] Basic PlayerProfile API

Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch

@@ -1,4 +1,4 @@
-From 7ef5a54b38b32977873fa0b50998a9425549967d Mon Sep 17 00:00:00 2001
+From 20ce1d6f58eaa8aa7b041d8f0588ab9505d035ae Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:04:51 -0400
 Subject: [PATCH] Shoulder Entities Release API

Spigot-API-Patches/0058-Profile-Lookup-Events.patch

@@ -1,4 +1,4 @@
-From 97ffcb9256d9f121a14c42cfc8142f250bafac71 Mon Sep 17 00:00:00 2001
+From cbcd37fcba051f9148b24a33e042f21093ed9f2e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 16:30:44 -0400
 Subject: [PATCH] Profile Lookup Events
@@ -168,5 +168,5 @@ index 00000000..e5a5986a
 +
 +}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0059-Entity-fromMobSpawner.patch

@@ -1,4 +1,4 @@
-From 8853a70eb883c407c751dfe4e32e24c70e278c17 Mon Sep 17 00:00:00 2001
+From e5a62fbf4f51754de1e49ce6046eefc76c317a73 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()

Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch

@@ -1,4 +1,4 @@
-From 93347de85dca36fb232ea77c2c767563e1e40ada Mon Sep 17 00:00:00 2001
+From 9185b0d77ba37d0e88629037967032c2b4ba3761 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Dec 2016 16:12:48 -0500
 Subject: [PATCH] Improve the Saddle API for Horses
@@ -78,5 +78,5 @@ index 00000000..7944f26a
 +
 +public interface SaddledHorseInventory extends AbstractHorseInventory {}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0061-ensureServerConversions-API.patch

@@ -1,4 +1,4 @@
-From 2d6c06d66fa0bb54e1e769dc71adbb750c64225d Mon Sep 17 00:00:00 2001
+From c6f53269f00ebf72dfb63f9e60fe9d96762faf50 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:55:48 -0400
 Subject: [PATCH] ensureServerConversions API
@@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
 to ensure it meets latest minecraft expectations.
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index ec2b8b8ed..3012aec22 100644
+index ec2b8b8e..3012aec2 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -134,4 +134,16 @@ public interface ItemFactory {
@@ -28,7 +28,7 @@ index ec2b8b8ed..3012aec22 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index c744799f6..5e8de1152 100644
+index c744799f..5e8de115 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -506,7 +506,12 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -65,5 +65,5 @@ index c744799f6..5e8de1152 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch

@@ -1,4 +1,4 @@
-From 51c81236c3fdc09dcf56197c10e8b63ec2f3dd2f Mon Sep 17 00:00:00 2001
+From f31c0b3a4d3fe17a7fd04057156089d7db81dc3a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:55:48 -0400
 Subject: [PATCH] Add getI18NDisplayName API
@@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
 You must replace the language file embedded in the server jar.
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 3012aec22..63dd1b32d 100644
+index 3012aec2..63dd1b32 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -145,5 +145,15 @@ public interface ItemFactory {
@@ -28,7 +28,7 @@ index 3012aec22..63dd1b32d 100644
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 5e8de1152..c3cb1247f 100644
+index 5e8de115..c3cb1247 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -582,5 +582,16 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -49,5 +49,5 @@ index 5e8de1152..c3cb1247f 100644
      // Paper end
  }
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch

@@ -1,4 +1,4 @@
-From 0cd8ed512dd2fde1f4d765f39a8cf35c8f91184c Mon Sep 17 00:00:00 2001
+From ad76debcffa4a9ef371ba7f2d8b9c1034f16fba4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:34 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
@@ -9,7 +9,7 @@ Allows you to do dynamic whitelisting and change of kick message
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java
 new file mode 100644
-index 000000000..b57fff9fb
+index 00000000..b57fff9f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java
 @@ -0,0 +1,111 @@
@@ -125,5 +125,5 @@ index 000000000..b57fff9fb
 +    }
 +}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch

@@ -1,4 +1,4 @@
-From 37638b5c57bc22517f707779b8c216d3cd24c131 Mon Sep 17 00:00:00 2001
+From 37c5379af867301839590856be1d68cdf1a0b4de Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 02:08:55 -0500
 Subject: [PATCH] Make /plugins list alphabetical
@@ -50,5 +50,5 @@ index e40b03a7..b1d384e8 100644
      }
  }
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0065-LivingEntity-setKiller.patch

@@ -1,11 +1,11 @@
-From b267465c0b09938121dd4582c5a62ae80d90da48 Mon Sep 17 00:00:00 2001
+From 66621223158643139e2189afc257009daf70f05e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:43 -0500
 Subject: [PATCH] LivingEntity#setKiller
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index f67711fd7..3f93b70c1 100644
+index f67711fd..3f93b70c 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -17,6 +17,8 @@ import org.bukkit.projectiles.ProjectileSource;
@@ -34,5 +34,5 @@ index f67711fd7..3f93b70c1 100644
       * Adds the given {@link PotionEffect} to the living entity.
       * <p>
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch

@@ -1,4 +1,4 @@
-From 082f9d34462d71296bfea52d7a17efc3dd2b547b Mon Sep 17 00:00:00 2001
+From 950732e4f72ad1ebd0983638df104c7957ecc3ef Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:14:13 +0200
 Subject: [PATCH] Handle plugin prefixes in implementation logging
@@ -17,7 +17,7 @@ The implementation should handle plugin prefixes by displaying
 logger names when appropriate.
 
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index 678878064..a81dae439 100644
+index 67887806..a81dae43 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 {
@@ -40,5 +40,5 @@ index 678878064..a81dae439 100644
  
      /**
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -1,4 +1,4 @@
-From d735b2fd3473458c15a83c4cf0635cd19957b476 Mon Sep 17 00:00:00 2001
+From 83b0d804b7335d31c3ff87a7070c401dc869d824 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:33:12 +0200
 Subject: [PATCH] Allow plugins to use SLF4J for logging
@@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through
 several layers of logging abstraction.
 
 diff --git a/pom.xml b/pom.xml
-index 84ba2076f..3ebc62871 100644
+index 84ba2076..3ebc6287 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -103,6 +103,14 @@
@@ -33,7 +33,7 @@ index 84ba2076f..3ebc62871 100644
          <dependency>
              <groupId>junit</groupId>
 diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java
-index 55debf5d5..8d2999ace 100644
+index 55debf5d..8d2999ac 100644
 --- a/src/main/java/org/bukkit/plugin/Plugin.java
 +++ b/src/main/java/org/bukkit/plugin/Plugin.java
 @@ -157,6 +157,12 @@ public interface Plugin extends TabExecutor {

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

@@ -1,4 +1,4 @@
-From 5e6d3bf1e2743a13eb1876f0513dc3f92bacdccb Mon Sep 17 00:00:00 2001
+From ab1ab274192f3fbc229d5480bf989597e383f1c2 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

Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch

@@ -1,4 +1,4 @@
-From 8e15888fcc667e68e2cb6f6d2b2febe36a7b3acd Mon Sep 17 00:00:00 2001
+From f260a9837d5bc3512ba711e4612fb095e71a0c23 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Sep 2017 17:21:32 -0400
 Subject: [PATCH] Add PlayerJumpEvent
@@ -112,5 +112,5 @@ index 00000000..dd24f9b0
 +    }
 +}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch

@@ -1,4 +1,4 @@
-From 80fa06b6f43663f3373953a11477ae13e07b0d91 Mon Sep 17 00:00:00 2001
+From 16cc6fb4885d1c34e7c05dad55cd53b16931ca41 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:44:42 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@@ -11,7 +11,7 @@ Add a NetworkClient interface that provides access to:
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/NetworkClient.java b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
 new file mode 100644
-index 000000000..9072e384d
+index 00000000..9072e384
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
 @@ -0,0 +1,39 @@
@@ -55,7 +55,7 @@ index 000000000..9072e384d
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 45690a2fa..7434203a4 100644
+index bf284f2c..5e65657a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -30,7 +30,7 @@ import org.bukkit.scoreboard.Scoreboard;
@@ -68,5 +68,5 @@ index 45690a2fa..7434203a4 100644
      /**
       * Gets the "friendly" name to display of this player. This may include
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch

@@ -1,4 +1,4 @@
-From 418c1570fa8d0784cfaadd1a7070143ef2de5241 Mon Sep 17 00:00:00 2001
+From fa9d75620f187b39ddf397a8a37e951768f1a1f5 Mon Sep 17 00:00:00 2001
 From: pkt77 <parkerkt77@gmail.com>
 Date: Fri, 10 Nov 2017 23:45:59 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent
@@ -146,5 +146,5 @@ index 00000000..0783ac82
 +    }
 +}
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch

@@ -1,4 +1,4 @@
-From 40e27a88bcb3fc6ab3299097db52b9df18ddab77 Mon Sep 17 00:00:00 2001
+From 4196a2419eb0aef7c2d79bc5373c2fc3bd38c81e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 6 Nov 2017 21:10:01 -0500
 Subject: [PATCH] API to get a BlockState without a snapshot
@@ -9,7 +9,7 @@ on the real tile entity.
 This is useful for where performance is needed
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 7664728a0..064acf321 100644
+index 7664728a..064acf32 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -254,6 +254,15 @@ public interface Block extends Metadatable {

Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch

@@ -1,4 +1,4 @@
-From 87499be0ee0fda808bf4d85547ccf0ad8f979ba3 Mon Sep 17 00:00:00 2001
+From e45cd02ad7224199d008068ce464d820e036130c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:17:09 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
@@ -13,7 +13,7 @@ completion, such as offline players.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
 new file mode 100644
-index 000000000..3c51aaf92
+index 00000000..3c51aaf9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
 @@ -0,0 +1,168 @@
@@ -186,7 +186,7 @@ index 000000000..3c51aaf92
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
-index a6229839c..f0bc3563f 100644
+index a6229839..f0bc3563 100644
 --- a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
 +++ b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
 @@ -1,5 +1,6 @@
@@ -247,5 +247,5 @@ index a6229839c..f0bc3563f 100644
  
      @Override
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch

@@ -1,4 +1,4 @@
-From 1d72b4d218c0c70b0a95059d93c1ae6d5de73fb6 Mon Sep 17 00:00:00 2001
+From 906da795cc0a27b10fcb9cea756bbc7b8556d9e4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 9 Dec 2017 12:40:25 -0500
 Subject: [PATCH] Display warning on deprecated recipe API
@@ -10,7 +10,7 @@ on the players login.
 Plugin authors need to define a key to keep it consistent between server restarts.
 
 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index 90d6d50cd..80af6cf52 100644
+index 90d6d50c..80af6cf5 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 @@ -25,6 +25,7 @@ public class ShapedRecipe implements Recipe, Keyed {
@@ -22,7 +22,7 @@ index 90d6d50cd..80af6cf52 100644
      }
  
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index ea359c540..7347e7464 100644
+index ea359c54..7347e746 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 @@ -26,6 +26,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
@@ -34,5 +34,5 @@ index ea359c540..7347e7464 100644
      }
  
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch

@@ -1,4 +1,4 @@
-From 82123411c5381dec16732f3e729b996f3bfd6baa Mon Sep 17 00:00:00 2001
+From 0b16ea6c94ad803083f1689c590e516a3d609ef4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:00:41 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
@@ -88,5 +88,5 @@ index 00000000..f9ef95cd
 +    }
 +}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch

@@ -1,4 +1,4 @@
-From 690ed111958090f2e13c9a53e6f3296820662330 Mon Sep 17 00:00:00 2001
+From f25f9e92ad692775de20a8953c170896bfb86cb4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:56:24 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
@@ -96,5 +96,5 @@ index 00000000..fb5b4b86
 +    }
 +}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch

@@ -1,4 +1,4 @@
-From 1537081482d80ea6cf1266b73f1c6c75d7f557a4 Mon Sep 17 00:00:00 2001
+From 7cf615732878ee88a9ae3c84136211222235cd03 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:38:07 -0500
 Subject: [PATCH] Ability to apply mending to XP API
@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 79c0e598a..5f3e085e3 100644
+index 5e65657a..c273b9dc 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -938,12 +938,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -49,5 +49,5 @@ index 79c0e598a..5f3e085e3 100644
      /**
       * Gives the player the amount of experience levels specified. Levels can
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch

@@ -1,4 +1,4 @@
-From b6f0cd76a70adc45822cfe0588077b30e999c2d2 Mon Sep 17 00:00:00 2001
+From 000a19b1709aa65092d49ea8a248d252b43f3390 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 16:59:43 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
@@ -119,5 +119,5 @@ index 00000000..bac1cef3
 +    }
 +}
 -- 
-2.16.1.windows.4
+2.20.1
 

Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch

@@ -1,4 +1,4 @@
-From eda3592be1d17598e7261a86c55c4377289c2721 Mon Sep 17 00:00:00 2001
+From 32783783cd18b9019b4bb321c8b41df12e9bfebf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:31:37 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
@@ -76,5 +76,5 @@ index 00000000..7c6953a7
 +    }
 +}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch

@@ -1,4 +1,4 @@
-From 5dbcfd053603e67423074aaa91dd327e6dca7a60 Mon Sep 17 00:00:00 2001
+From 6df1eea3118148d343e2ba943ed0e79e3272e981 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 19 Jan 2018 00:29:28 -0500
 Subject: [PATCH] Add setPlayerProfile API for Skulls
@@ -77,5 +77,5 @@ index 15c1dfd9..a458000f 100644
       * Gets the owner of the skull.
       *
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch

@@ -1,4 +1,4 @@
-From d6ace9b5fd0e4dc637739347aefb6bcac808120c Mon Sep 17 00:00:00 2001
+From 18c2f27c07c4ae9d951ecf9a7685a0af1b6433fa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 2 Jan 2018 00:31:08 -0500
 Subject: [PATCH] Fill Profile Property Events
@@ -169,5 +169,5 @@ index 00000000..aba0c087
 +    }
 +}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch

@@ -1,4 +1,4 @@
-From 37b0fe3449844988fdd20179130e820106c703c7 Mon Sep 17 00:00:00 2001
+From 96c07697f9a38156b9d1cf552b0796f60ff807b4 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Jan 2018 08:15:14 -0600
 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
@@ -69,5 +69,5 @@ index 00000000..b65ee9e5
 +    }
 +}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch

@@ -1,4 +1,4 @@
-From c8dfb1c1ac5047c3989ed89c48a202c8e565f4d3 Mon Sep 17 00:00:00 2001
+From a41ad2b2b17582d7d06e0ff76289ae75ddb9d0aa Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:06:24 -0500
 Subject: [PATCH] Add ArmorStand Item Meta
@@ -95,5 +95,5 @@ index 00000000..7e4acfff
 +    void setMarker(boolean marker);
 +}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0084-Optimize-Hoppers.patch

@@ -1,4 +1,4 @@
-From 6c67c5ba8e8ce89bfdd90a1d6264d14ba6a9037b Mon Sep 17 00:00:00 2001
+From 05f491b4b41e5682ea37eec688ab9f37d0a4d4e3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 18 Jan 2018 01:00:27 -0500
 Subject: [PATCH] Optimize Hoppers
@@ -38,5 +38,5 @@ index 06ec99ae..b44cc45b 100644
      }
  
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch

@@ -1,4 +1,4 @@
-From ba8f331145982701fc0e9dc323c75e54fb5130d2 Mon Sep 17 00:00:00 2001
+From 1cbb7e853c6b79fe56bb48056ef19cbf83e4a85f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 24 Feb 2018 00:55:52 -0500
 Subject: [PATCH] Tameable#getOwnerUniqueId API
@@ -33,5 +33,5 @@ index 44497aa3..0987c1e8 100644
       */
      public AnimalTamer getOwner();
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch

@@ -1,4 +1,4 @@
-From 320c3d77f68b7b02d88d293898e91681cac3c90e Mon Sep 17 00:00:00 2001
+From 596ebbbd59baec68f0614f1e3d91e04dd5125562 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 11:43:30 -0400
 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
@@ -51,5 +51,5 @@ index 1d571889..0c16128e 100644
          this.message = "";
          this.name = name;
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch

@@ -1,4 +1,4 @@
-From 4987254c0fc69b5f08d88f3dec52e37a6e68140d Mon Sep 17 00:00:00 2001
+From 62f34963ecb11533fab2828dfd058a95235bdb67 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 15:55:38 +0200
 Subject: [PATCH] Add extended PaperServerListPingEvent

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

@@ -1,4 +1,4 @@
-From c06616f07f969d2090db6ea62443e683748d7f73 Mon Sep 17 00:00:00 2001
+From efed9414eb7c7ae2509d89bb10a338a0a49347ce 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

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

@@ -1,4 +1,4 @@
-From a6af67f99eedf4c5f95deb04a8f4bac3be154a7f Mon Sep 17 00:00:00 2001
+From e5672f4f22bb0f9012699159f3ea469d020439be 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
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index bc04472e..bd246827 100644
+index 75634a8d..cbabd807 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -435,6 +435,20 @@ public final class Bukkit {
@@ -34,7 +34,7 @@ index bc04472e..bd246827 100644
       * Gets the plugin manager for interfacing with plugins.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9f3ffb16..5eb1d371 100644
+index 1d1f7784..9c5049cd 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -365,6 +365,18 @@ public interface Server extends PluginMessageRecipient {

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

@@ -1,4 +1,4 @@
-From 3866b0ae220a8374b807898691fa739df7b004f8 Mon Sep 17 00:00:00 2001
+From 2411eb933aeb83a5124757188f75cdc6a14717e3 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

Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch

@@ -1,4 +1,4 @@
-From c00df0fb555cd5271eec8c911fb1899020bc1a2a Mon Sep 17 00:00:00 2001
+From 30c6337b2360b9771076eecc17f04d913e8b9267 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 1 Apr 2018 02:28:43 +0300
 Subject: [PATCH] Add method to open already placed sign

Spigot-API-Patches/0092-Add-version-history-to-version-command.patch

@@ -1,4 +1,4 @@
-From 34043f0447c8342e21d4a3e64a0991a7cb00a46c Mon Sep 17 00:00:00 2001
+From 0a63d922250d7a43024aab5ea89b511396cde43a Mon Sep 17 00:00:00 2001
 From: Kyle Wood <demonwav@gmail.com>
 Date: Thu, 1 Mar 2018 19:37:52 -0600
 Subject: [PATCH] Add version history to version command
@@ -6,7 +6,7 @@ Subject: [PATCH] Add version history to version command
 
 diff --git a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
 new file mode 100644
-index 000000000..1daaca2fd
+index 00000000..1daaca2f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
 @@ -0,0 +1,143 @@
@@ -154,7 +154,7 @@ index 000000000..1daaca2fd
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index f38f68640..5cebb2454 100644
+index f38f6864..5cebb245 100644
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 @@ -29,6 +29,7 @@ import org.json.simple.parser.ParseException;
@@ -197,5 +197,5 @@ index f38f68640..5cebb2454 100644
          PluginDescriptionFile desc = plugin.getDescription();
          sender.sendMessage(ChatColor.GREEN + desc.getName() + ChatColor.WHITE + " version " + ChatColor.GREEN + desc.getVersion());
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch

@@ -1,4 +1,4 @@
-From 366c846839d73d5acaee73780f2cd046519e6b2d Mon Sep 17 00:00:00 2001
+From b2247dff46727c6576f4943354996ff552e21791 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Apr 2018 10:28:50 -0400
 Subject: [PATCH] Add Ban Methods to Player Objects
@@ -8,7 +8,7 @@ Allows a more logical API for banning players.
 player.banPlayer("Breaking the rules");
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index d82790717..658eac264 100644
+index d8279071..658eac26 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
 @@ -39,6 +39,56 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
@@ -69,7 +69,7 @@ index d82790717..658eac264 100644
      /**
       * Checks if this player is whitelisted or not
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1e349066d..c9f027f99 100644
+index 5dc04f47..ddf226a4 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1,10 +1,14 @@
@@ -228,5 +228,5 @@ index 1e349066d..c9f027f99 100644
      /**
       * Sends an Action Bar message to the client.
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0094-EndermanEscapeEvent.patch

@@ -1,4 +1,4 @@
-From e6e2f854d47264daa82dac76e0e9b50e1d048112 Mon Sep 17 00:00:00 2001
+From 66cc32083b1330586dff52b36c17828d0ed2d6e7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:14:30 -0400
 Subject: [PATCH] EndermanEscapeEvent
@@ -96,5 +96,5 @@ index 00000000..0d15a8ab
 +    }
 +}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0095-Enderman.teleportRandomly.patch

@@ -1,4 +1,4 @@
-From d39ff6984ee7da570e62149453cc739c70608e7d Mon Sep 17 00:00:00 2001
+From 1020cf1bb231062418dfebbf41aff92e762a470e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:29:15 -0400
 Subject: [PATCH] Enderman.teleportRandomly()
@@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
 Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
 
 diff --git a/src/main/java/org/bukkit/entity/Enderman.java b/src/main/java/org/bukkit/entity/Enderman.java
-index ab827f83..459ec0c9 100644
+index edb49a20..1ea289b5 100644
 --- a/src/main/java/org/bukkit/entity/Enderman.java
 +++ b/src/main/java/org/bukkit/entity/Enderman.java
 @@ -8,6 +8,17 @@ import org.bukkit.material.MaterialData;
@@ -28,5 +28,5 @@ index ab827f83..459ec0c9 100644
       * Gets the id and data of the block that the Enderman is carrying.
       *
 -- 
-2.18.0
+2.20.1
 

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

@@ -1,4 +1,4 @@
-From 1d5e8a86bb4cb2d3b56a98d9b8ebb662146398dc Mon Sep 17 00:00:00 2001
+From fd36072a3ce6839ef977bedd24f3b459a0933f3d 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

Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch

@@ -1,4 +1,4 @@
-From d6390344700e8736df3210e7fe2b54d942dd0b3f Mon Sep 17 00:00:00 2001
+From 2b2f63ce1bf3c15f8688b6fb80eed9a83b292114 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 19:27:31 -0400
 Subject: [PATCH] Location.isChunkLoaded() API
@@ -17,5 +17,5 @@ index 5c3d42cc..1ddebf3c 100644
      public boolean equals(Object obj) {
          if (obj == null) {
 -- 
-2.18.0
+2.20.1
 

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

@@ -1,4 +1,4 @@
-From fd0c3591ced0cfa123d9226f18318fb0e0c87536 Mon Sep 17 00:00:00 2001
+From c367daf8d4c29ed21bd88d582dc21bd9abc1c4a7 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

Spigot-API-Patches/0099-EndermanAttackPlayerEvent.patch

@@ -1,4 +1,4 @@
-From 80c1d5d792249102bb1e09659b279183a743c174 Mon Sep 17 00:00:00 2001
+From 75e762447840834a7c3f6e3c48af2136be41b1dc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:17:44 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
@@ -9,7 +9,7 @@ This allows you to override/extend the pumpkin/stare logic.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java
 new file mode 100644
-index 000000000..ab5a7a6b5
+index 00000000..ab5a7a6b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java
 @@ -0,0 +1,96 @@
@@ -110,5 +110,5 @@ index 000000000..ab5a7a6b5
 +    }
 +}
 -- 
-2.18.0
+2.20.1
 

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

@@ -1,4 +1,4 @@
-From 53b080c35566392e83fc231ce763897a0e9420a4 Mon Sep 17 00:00:00 2001
+From e6848b857dc953c4ab20b2d1c9697597488abbf5 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

Spigot-API-Patches/0101-WitchConsumePotionEvent.patch

@@ -1,4 +1,4 @@
-From d902c6cdb1dfed8c8eafff0a513e91a87186c94e Mon Sep 17 00:00:00 2001
+From ba6dedde58f6f28c09dc1d8226c3e8269b956597 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:26:16 -0400
 Subject: [PATCH] WitchConsumePotionEvent
@@ -7,7 +7,7 @@ Fires when a witch consumes the potion in their hand
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java
 new file mode 100644
-index 000000000..790218998
+index 00000000..79021899
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java
 @@ -0,0 +1,64 @@
@@ -77,7 +77,7 @@ index 000000000..790218998
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
 new file mode 100644
-index 000000000..6ef6367b6
+index 00000000..6ef6367b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
 @@ -0,0 +1,33 @@
@@ -115,5 +115,5 @@ index 000000000..6ef6367b6
 +    }
 +}
 -- 
-2.18.0
+2.20.1
 

Spigot-API-Patches/0102-WitchThrowPotionEvent.patch

@@ -1,4 +1,4 @@
-From ec8448715301fcfc22907e25053ce24046112ec7 Mon Sep 17 00:00:00 2001
+From f7201b04e24d4bbf74d326bf78b5edce24be9e0d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:39:09 -0400
 Subject: [PATCH] WitchThrowPotionEvent
@@ -79,5 +79,5 @@ index 6ef6367b..77487e28 100644
  
      @Override
 -- 
-2.18.0
+2.20.1