diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch
index 30bc85ad88..2e5066b6c4 100644
--- a/Spigot-API-Patches/0001-POM-changes.patch
+++ b/Spigot-API-Patches/0001-POM-changes.patch
@@ -1,14 +1,14 @@
-From fb5f733cfceb51c30b4ccc0c63e82c715882c042 Mon Sep 17 00:00:00 2001
+From 8c171d927b531952ea64b04d2871c4d221b9222a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 17:16:08 -0600
 Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 66bb7a12..ea6a710e 100644
+index 66bb7a12..0899a127 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -4,35 +4,37 @@
+@@ -4,35 +4,36 @@
      <modelVersion>4.0.0</modelVersion>
  
      <parent>
@@ -36,8 +36,7 @@ index 66bb7a12..ea6a710e 100644
      <properties>
 -        <maven.compiler.source>1.6</maven.compiler.source>
 -        <maven.compiler.target>1.6</maven.compiler.target>
-+        <!-- Paper - Bump to 1.8 - This will haunt me -->
-+        <additionalparam>-Xdoclint:none</additionalparam>
++        <!-- Paper - Bump to 1.8 - Because Duh... -->
 +        <maven.compiler.source>1.8</maven.compiler.source>
 +        <maven.compiler.target>1.8</maven.compiler.target>
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -59,7 +58,7 @@ index 66bb7a12..ea6a710e 100644
          </snapshotRepository>
      </distributionManagement>
  
-@@ -44,6 +46,13 @@
+@@ -44,6 +45,13 @@
          </pluginRepository>
      </pluginRepositories>
  
@@ -73,7 +72,7 @@ index 66bb7a12..ea6a710e 100644
      <dependencies>
          <dependency>
              <groupId>commons-lang</groupId>
-@@ -58,6 +67,13 @@
+@@ -58,6 +66,13 @@
              <type>jar</type>
              <scope>compile</scope>
          </dependency>
@@ -87,7 +86,7 @@ index 66bb7a12..ea6a710e 100644
          <!-- bundled with Minecraft, should be kept in sync -->
          <dependency>
              <groupId>com.google.guava</groupId>
-@@ -102,6 +118,7 @@
+@@ -102,6 +117,7 @@
      </dependencies>
  
      <build>
@@ -95,7 +94,7 @@ index 66bb7a12..ea6a710e 100644
          <plugins>
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
-@@ -124,26 +141,6 @@
+@@ -124,26 +140,6 @@
                  </dependencies>
              </plugin>
              <plugin>
@@ -122,7 +121,7 @@ index 66bb7a12..ea6a710e 100644
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-shade-plugin</artifactId>
                  <version>2.4.3</version>
-@@ -156,8 +153,7 @@
+@@ -156,8 +152,7 @@
                      </execution>
                  </executions>
                  <configuration>
diff --git a/Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch
index da70825a68..7f563c2380 100644
--- a/Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch
+++ b/Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch
@@ -1,14 +1,14 @@
-From 68c630ca51baec9eb6c20b206e7119fd72c9c854 Mon Sep 17 00:00:00 2001
+From abf6ef5d9306c02a64d2463f9b5080aa36c1ddd9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 1 Apr 2016 00:02:47 -0400
 Subject: [PATCH] add Trove and FastUtil to Bukkit
 
 
 diff --git a/pom.xml b/pom.xml
-index 46df34d..5e5e5e4 100644
+index 0899a127..8990bdcc 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -55,6 +55,19 @@
+@@ -54,6 +54,19 @@
  
      <dependencies>
          <dependency>
@@ -29,5 +29,5 @@ index 46df34d..5e5e5e4 100644
              <artifactId>commons-lang</artifactId>
              <version>2.6</version>
 -- 
-2.9.0
+2.13.0.windows.1
 
diff --git a/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch
index 5a967874c6..b7655e4fc7 100644
--- a/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch
+++ b/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch
@@ -1,4 +1,4 @@
-From 0e3da9b4f55b5b2a07c2bdb4eb6c4e500422fef4 Mon Sep 17 00:00:00 2001
+From 35fae0eeb31476dc9704645cce8045ebb19f0f18 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 c7514ba9..c671cc33 100644
+index 8990bdcc..e7a4eb2c 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -128,6 +128,12 @@
+@@ -127,6 +127,12 @@
              <version>1.3</version>
              <scope>test</scope>
          </dependency>
@@ -395,5 +395,5 @@ index d8b9c244..40fd71dc 100644
                  eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
              } else {
 -- 
-2.11.0
+2.13.0.windows.1