Updated Upstream (Bukkit/CraftBukkit)

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

Bukkit Changes:
d58803c2 SPIGOT-4597: Make BlockDropItemEvent use a list
d450fdf1 Add note about Maven repository usage to pom.xml

CraftBukkit Changes:
ed274c51 SPIGOT-4597: Make BlockDropItemEvent use a list
1734f378 SPIGOT-4598: Shift click on custom workbench inventory causes crash
a65b73ad Add note about Maven repository usage to pom.xml

Spigot-API-Patches/0001-POM-changes.patch

@@ -1,14 +1,14 @@
-From ffc2ee319da1ad8b57a13d9aa0dd8711ce6ee4ad Mon Sep 17 00:00:00 2001
+From 02d5007d081bde67f58dac3e04ce1df9e70ff9b4 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 00:16:08 +0100
 Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 00d8019d9..148c322bc 100644
+index 23fde9622..a613cf963 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -3,38 +3,37 @@
+@@ -3,33 +3,28 @@
           xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
      <modelVersion>4.0.0</modelVersion>
  
@@ -53,7 +53,9 @@ index 00d8019d9..148c322bc 100644
 -    </distributionManagement>
 -
      <repositories>
-         <repository>
+         <!--
+             If you are a plugin developer, please use https://hub.spigotmc.org/nexus/content/repositories/snapshots/
+@@ -41,6 +36,10 @@
              <id>spigotmc-public</id>
              <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
          </repository>
@@ -64,7 +66,7 @@ index 00d8019d9..148c322bc 100644
      </repositories>
  
      <pluginRepositories>
-@@ -57,6 +56,13 @@
+@@ -63,6 +62,13 @@
              <version>1.1.1</version>
              <scope>compile</scope>
          </dependency>
@@ -78,7 +80,7 @@ index 00d8019d9..148c322bc 100644
          <!-- bundled with Minecraft, should be kept in sync -->
          <dependency>
              <groupId>com.google.guava</groupId>
-@@ -101,15 +107,12 @@
+@@ -107,15 +113,12 @@
      </dependencies>
  
      <build>
@@ -95,7 +97,7 @@ index 00d8019d9..148c322bc 100644
                  <dependencies>
                      <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
                      <dependency>
-@@ -144,6 +147,7 @@
+@@ -150,6 +153,7 @@
                      </execution>
                  </executions>
                  <configuration>

Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch

@@ -1,4 +1,4 @@
-From 82f0740953bd81ddf86eff39d3bfba0aa4163cf2 Mon Sep 17 00:00:00 2001
+From af5c59b98dedbd732043a1f9155a94fb96158383 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 1 Apr 2016 00:02:47 -0400
 Subject: [PATCH] Add FastUtil to Bukkit
@@ -6,10 +6,10 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization
 
 diff --git a/pom.xml b/pom.xml
-index 229fe559..412a6901 100644
+index a613cf963..f8f12595b 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -44,6 +44,12 @@
+@@ -50,6 +50,12 @@
      </pluginRepositories>
  
      <dependencies>

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

@@ -1,4 +1,4 @@
-From bb0950fa863a7f52e3217d936719224d650e224f Mon Sep 17 00:00:00 2001
+From dd5c7d73e74b48760f58cee1810cb23f3c9a4352 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,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/pom.xml b/pom.xml
-index 412a6901..041ae474 100644
+index f8f12595b..84ba2076f 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -110,6 +110,17 @@
+@@ -116,6 +116,17 @@
              <version>1.3</version>
              <scope>test</scope>
          </dependency>
@@ -29,7 +29,7 @@ index 412a6901..041ae474 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 00000000..9ff99e3b
+index 000000000..9ff99e3b3
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
 @@ -0,0 +1,40 @@
@@ -75,7 +75,7 @@ index 00000000..9ff99e3b
 +}
 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 00000000..f60f0100
+index 000000000..f60f01005
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
 @@ -0,0 +1,39 @@
@@ -120,7 +120,7 @@ index 00000000..f60f0100
 +}
 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 00000000..140cf0ad
+index 000000000..140cf0ad3
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
 @@ -0,0 +1,44 @@
@@ -170,7 +170,7 @@ index 00000000..140cf0ad
 +}
 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 00000000..6941d9fb
+index 000000000..6941d9fbf
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
 @@ -0,0 +1,32 @@
@@ -208,7 +208,7 @@ index 00000000..6941d9fb
 +}
 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 00000000..1473ff8c
+index 000000000..1473ff8cd
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
 @@ -0,0 +1,63 @@
@@ -277,7 +277,7 @@ index 00000000..1473ff8c
 +}
 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 00000000..62acbf82
+index 000000000..62acbf821
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
 @@ -0,0 +1,33 @@
@@ -315,7 +315,7 @@ index 00000000..62acbf82
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java
-index 3b2c99ea..b45b6c1c 100644
+index 3b2c99ea7..b45b6c1c3 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,7 +401,7 @@ index 3b2c99ea..b45b6c1c 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 bf972302..77207f14 100644
+index bf9723029..77207f147 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/0066-Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -1,4 +1,4 @@
-From 9ac71cdcf1de81731a46bd1f0aabac54498a6a06 Mon Sep 17 00:00:00 2001
+From d735b2fd3473458c15a83c4cf0635cd19957b476 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,10 +14,10 @@ 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 041ae474..3e2c1cd5 100644
+index 84ba2076f..3ebc62871 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -97,6 +97,14 @@
+@@ -103,6 +103,14 @@
              <scope>compile</scope>
          </dependency>
  
@@ -33,7 +33,7 @@ index 041ae474..3e2c1cd5 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 55debf5d..8d2999ac 100644
+index 55debf5d5..8d2999ace 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 {