diff --git a/patches/api/0002-Create-interfaces-for-getting-UUIDs-and-Players.patch b/patches/api/0002-Create-interfaces-for-getting-UUIDs-and-Players.patch
index 70ac7b8..8727272 100644
--- a/patches/api/0002-Create-interfaces-for-getting-UUIDs-and-Players.patch
+++ b/patches/api/0002-Create-interfaces-for-getting-UUIDs-and-Players.patch
@@ -911,7 +911,7 @@ index 9013d043503d175004ad276799e5935b7fa59dc4..9a6e1ebd46d580addf532786842ea64f
      private boolean cancelled;
  
 diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index c9af02b0f62b3d18da1e91d1ea02ce0864fc60b9..35e8c680309f0a67e941b749240f902be07c22e6 100644
+index 77aefda5aac4602bf5bf71c29600e7450defdd4e..e1275a902986ea82187f491503032d60b8c2c784 100644
 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 @@ -4,6 +4,7 @@ import java.net.InetAddress;
diff --git a/patches/api/0004-Update-to-Java-16.patch b/patches/api/0004-Update-to-Java-15.patch
similarity index 92%
rename from patches/api/0004-Update-to-Java-16.patch
rename to patches/api/0004-Update-to-Java-15.patch
index 93d0802..e133a6f 100644
--- a/patches/api/0004-Update-to-Java-16.patch
+++ b/patches/api/0004-Update-to-Java-15.patch
@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: lexikiq <noellekiq@gmail.com>
 Date: Sun, 9 May 2021 17:03:09 -0400
-Subject: [PATCH] Update to Java 16
+Subject: [PATCH] Update to Java 15
 
 
 diff --git a/pom.xml b/pom.xml
-index 8a45c77963d3cd35d2cfa4a3af15c0e27bbbf165..fcb44552c21168bbefcbea7f04c1f1aa45f5f4dc 100644
+index 8a45c77963d3cd35d2cfa4a3af15c0e27bbbf165..ed910c6c7851dc4c4d2c540c0cb6285ae4e4be46 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -19,8 +19,10 @@
@@ -15,8 +15,8 @@ index 8a45c77963d3cd35d2cfa4a3af15c0e27bbbf165..fcb44552c21168bbefcbea7f04c1f1aa
 -        <maven.compiler.source>1.8</maven.compiler.source>
 -        <maven.compiler.target>1.8</maven.compiler.target>
 +        <!-- Parchment start -->
-+        <maven.compiler.source>16</maven.compiler.source>
-+        <maven.compiler.target>16</maven.compiler.target>
++        <maven.compiler.source>15</maven.compiler.source>
++        <maven.compiler.target>15</maven.compiler.target>
 +        <!-- Parchment end -->
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
          <adventure.version>4.7.0</adventure.version> <!-- Paper - When updating this make sure to update the linked JavaDocs on the homepage as well! -->
diff --git a/patches/api/0006-Update-to-Java-16.patch b/patches/api/0006-Update-to-Java-16.patch
new file mode 100644
index 0000000..52792d2
--- /dev/null
+++ b/patches/api/0006-Update-to-Java-16.patch
@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: lexikiq <noellekiq@gmail.com>
+Date: Thu, 13 May 2021 21:24:52 -0400
+Subject: [PATCH] Update to Java 16
+
+
+diff --git a/pom.xml b/pom.xml
+index ed910c6c7851dc4c4d2c540c0cb6285ae4e4be46..893c4d14debae398cab2ce4f5a2e420bbdf5d54b 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -20,8 +20,8 @@
+     <properties>
+         <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
+         <!-- Parchment start -->
+-        <maven.compiler.source>15</maven.compiler.source>
+-        <maven.compiler.target>15</maven.compiler.target>
++        <maven.compiler.source>16</maven.compiler.source>
++        <maven.compiler.target>16</maven.compiler.target>
+         <!-- Parchment end -->
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+         <adventure.version>4.7.0</adventure.version> <!-- Paper - When updating this make sure to update the linked JavaDocs on the homepage as well! -->
+@@ -225,7 +225,7 @@
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-shade-plugin</artifactId>
+-                <version>3.2.3</version>
++                <version>3.3.0-SNAPSHOT</version>
+                 <executions>
+                     <execution>
+                         <phase>package</phase>
diff --git a/patches/server/0003-Parchment-brand-changes.patch b/patches/server/0003-Parchment-brand-changes.patch
index 094fe2b..97ced8e 100644
--- a/patches/server/0003-Parchment-brand-changes.patch
+++ b/patches/server/0003-Parchment-brand-changes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Parchment brand changes
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 61712ae515b329a6b85dbe2e5960e4e864dc7731..051ba2c4ae14c5da58177e52f5c55241f97caab8 100644
+index 35bb4d0b9ed131e6570cce0b43ae78c5557a0bff..8d651788bce04f4d6d3e8bcbd3f97a8e0bbacf02 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1579,7 +1579,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1580,7 +1580,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
@@ -18,7 +18,7 @@ index 61712ae515b329a6b85dbe2e5960e4e864dc7731..051ba2c4ae14c5da58177e52f5c55241
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1a0b3e2313b87c6a5eb049838ec72304dcc8f543..e91e5c3ee22a6bb646956b06ae3949ee7e5bea0b 100644
+index 6cc8eb04f42592aa12f76bb4a0a863ea509741b2..ae3af6c152aefad32616c9debd4f1172c49f68fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -232,7 +232,7 @@ import javax.annotation.Nullable; // Paper
diff --git a/patches/server/0005-Bump-to-Java-16.patch b/patches/server/0005-Update-to-Java-15.patch
similarity index 67%
rename from patches/server/0005-Bump-to-Java-16.patch
rename to patches/server/0005-Update-to-Java-15.patch
index 3534cd0..ebf0459 100644
--- a/patches/server/0005-Bump-to-Java-16.patch
+++ b/patches/server/0005-Update-to-Java-15.patch
@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: lexikiq <noellekiq@gmail.com>
 Date: Tue, 4 May 2021 13:02:02 -0400
-Subject: [PATCH] Bump to Java 16
+Subject: [PATCH] Update to Java 15
 
 
 diff --git a/pom.xml b/pom.xml
-index dde8ac8aadd56c411f72c12124dcf301ea50e169..1effeb293e9e404b7712487a8c88f1c8ef4d6e6b 100644
+index dde8ac8aadd56c411f72c12124dcf301ea50e169..731610f136521d984508796a9d9fcea7ed477fac 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -14,8 +14,8 @@
@@ -14,8 +14,8 @@ index dde8ac8aadd56c411f72c12124dcf301ea50e169..1effeb293e9e404b7712487a8c88f1c8
          <minecraft_version>1_16_R3</minecraft_version>
 -        <maven.compiler.source>1.8</maven.compiler.source>
 -        <maven.compiler.target>1.8</maven.compiler.target>
-+        <maven.compiler.source>16</maven.compiler.source>
-+        <maven.compiler.target>16</maven.compiler.target>
++        <maven.compiler.source>15</maven.compiler.source>
++        <maven.compiler.target>15</maven.compiler.target>
      </properties>
  
      <parent>
diff --git a/patches/server/0008-Update-to-Java-16.patch b/patches/server/0008-Update-to-Java-16.patch
new file mode 100644
index 0000000..16453ce
--- /dev/null
+++ b/patches/server/0008-Update-to-Java-16.patch
@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: lexikiq <noellekiq@gmail.com>
+Date: Thu, 13 May 2021 21:24:52 -0400
+Subject: [PATCH] Update to Java 16
+
+
+diff --git a/pom.xml b/pom.xml
+index 731610f136521d984508796a9d9fcea7ed477fac..d993fbf9794df17467d55b198c9f2112ac2f131f 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -14,8 +14,8 @@
+         <bt.name>git</bt.name>
+         <minecraft.version>1.16.5</minecraft.version>
+         <minecraft_version>1_16_R3</minecraft_version>
+-        <maven.compiler.source>15</maven.compiler.source>
+-        <maven.compiler.target>15</maven.compiler.target>
++        <maven.compiler.source>16</maven.compiler.source>
++        <maven.compiler.target>16</maven.compiler.target>
+     </properties>
+ 
+     <parent>
+@@ -227,7 +227,7 @@
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-shade-plugin</artifactId>
+-                <version>3.2.3</version>
++                <version>3.3.0-SNAPSHOT</version>
+                 <executions>
+                     <execution>
+                         <phase>package</phase>