diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index 540d88e..f667c61 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [16]
+        java: [15]
 
     steps:
     - uses: actions/checkout@v2
@@ -19,13 +19,6 @@ jobs:
       with:
         java-version: ${{ matrix.java }}
 
-    - name: JDK 16 Maven Shade Workaround
-      run: |
-        git clone https://github.com/apache/maven-shade-plugin.git
-        cd maven-shade-plugin
-        mvn clean install
-        cd ..
-
     - uses: actions/cache@v2
       with:
         path: ~/.m2/repository
diff --git a/.github/workflows/push-build.yml b/.github/workflows/push-build.yml
index d9f89f8..f08c7b3 100644
--- a/.github/workflows/push-build.yml
+++ b/.github/workflows/push-build.yml
@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [16]
+        java: [15]
 
     steps:
     - uses: actions/checkout@v2
@@ -19,13 +19,6 @@ jobs:
       with:
         java-version: ${{ matrix.java }}
 
-    - name: JDK 16 Maven Shade Workaround
-      run: |
-        git clone https://github.com/apache/maven-shade-plugin.git
-        cd maven-shade-plugin
-        mvn clean install
-        cd ..
-
     - uses: actions/cache@v2
       with:
         path: ~/.m2/repository
diff --git a/Paper b/Paper
index 453c7f0..aeb6e7d 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 453c7f05c7ee48aa2252a1e882fd3422297de26e
+Subproject commit aeb6e7dd25439d23f11f956215927bcbf03a8e87
diff --git a/Parchment-Common/pom.xml b/Parchment-Common/pom.xml
index ce9960d..b3d83c1 100644
--- a/Parchment-Common/pom.xml
+++ b/Parchment-Common/pom.xml
@@ -19,8 +19,8 @@
     <description>Common utility files and interfaces for Parchment</description>
 
     <properties>
-        <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>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
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 8727272..70ac7b8 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 77aefda5aac4602bf5bf71c29600e7450defdd4e..e1275a902986ea82187f491503032d60b8c2c784 100644
+index c9af02b0f62b3d18da1e91d1ea02ce0864fc60b9..35e8c680309f0a67e941b749240f902be07c22e6 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/0006-Update-to-Java-16.patch b/patches/api/0006-Update-to-Java-16.patch
deleted file mode 100644
index 52792d2..0000000
--- a/patches/api/0006-Update-to-Java-16.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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 97ced8e..094fe2b 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 35bb4d0b9ed131e6570cce0b43ae78c5557a0bff..8d651788bce04f4d6d3e8bcbd3f97a8e0bbacf02 100644
+index 61712ae515b329a6b85dbe2e5960e4e864dc7731..051ba2c4ae14c5da58177e52f5c55241f97caab8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1580,7 +1580,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1579,7 +1579,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
@@ -18,7 +18,7 @@ index 35bb4d0b9ed131e6570cce0b43ae78c5557a0bff..8d651788bce04f4d6d3e8bcbd3f97a8e
  
      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 6cc8eb04f42592aa12f76bb4a0a863ea509741b2..ae3af6c152aefad32616c9debd4f1172c49f68fd 100644
+index 1a0b3e2313b87c6a5eb049838ec72304dcc8f543..e91e5c3ee22a6bb646956b06ae3949ee7e5bea0b 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-Update-to-Java-15.patch b/patches/server/0005-Bump-to-Java-15.patch
similarity index 95%
rename from patches/server/0005-Update-to-Java-15.patch
rename to patches/server/0005-Bump-to-Java-15.patch
index ebf0459..2a6db55 100644
--- a/patches/server/0005-Update-to-Java-15.patch
+++ b/patches/server/0005-Bump-to-Java-15.patch
@@ -1,7 +1,7 @@
 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] Update to Java 15
+Subject: [PATCH] Bump to Java 15
 
 
 diff --git a/pom.xml b/pom.xml
diff --git a/patches/server/0008-Update-to-Java-16.patch b/patches/server/0008-Update-to-Java-16.patch
deleted file mode 100644
index 16453ce..0000000
--- a/patches/server/0008-Update-to-Java-16.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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>
diff --git a/work/Paperclip b/work/Paperclip
index d04bf62..1da6da8 160000
--- a/work/Paperclip
+++ b/work/Paperclip
@@ -1 +1 @@
-Subproject commit d04bf62b5412349520bb4addfeecb3a662949d5f
+Subproject commit 1da6da880a3d1939fb8a22d9680dd35df9a5825a