diff --git a/Paper b/Paper
index 26dfbc804..3f5564f1b 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 26dfbc8046912e53f899a172fccb171ff6c46487
+Subproject commit 3f5564f1bcc7058b16865a1a74ed4aade513c931
diff --git a/current-paper b/current-paper
index 89c016293..7678937e6 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.15.1--b27330331352957a9a859154216a981efdb28bb8
+1.15.1--fa05334178501d099a80430f8a4d24a784514075
diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch
index 19b52e375..362c03e24 100644
--- a/patches/server/0001-Rebrand.patch
+++ b/patches/server/0001-Rebrand.patch
@@ -1,4 +1,4 @@
-From 4a95ea019473f8203a2d0e137ca873e647cb7d66 Mon Sep 17 00:00:00 2001
+From d7157493340eae748625f3acbcb8a4880e092c96 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 01:02:11 -0500
 Subject: [PATCH] Rebrand
@@ -86,10 +86,10 @@ index cd6e25923..bb227bc0f 100644
          );
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 664c48d68..8596d1c2e 100644
+index edb3a6035..f14d1b160 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1473,7 +1473,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1474,7 +1474,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
diff --git a/patches/server/0049-Add-blacklist-option-for-grindstone.patch b/patches/server/0049-Add-blacklist-option-for-grindstone.patch
index 18c52b441..b612e3800 100644
--- a/patches/server/0049-Add-blacklist-option-for-grindstone.patch
+++ b/patches/server/0049-Add-blacklist-option-for-grindstone.patch
@@ -1,4 +1,4 @@
-From 048dd5d83f29ca5b1bf030a4adfbfbf8246de432 Mon Sep 17 00:00:00 2001
+From 743e226dce9e746bd2d0358ed10d487ca53a537b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 1 Aug 2019 19:15:12 -0500
 Subject: [PATCH] Add blacklist option for grindstone
@@ -10,7 +10,7 @@ Subject: [PATCH] Add blacklist option for grindstone
  3 files changed, 35 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/ContainerGrindstone.java b/src/main/java/net/minecraft/server/ContainerGrindstone.java
-index ed88e208d0..0a5abd2e10 100644
+index ed88e208d..0a5abd2e1 100644
 --- a/src/main/java/net/minecraft/server/ContainerGrindstone.java
 +++ b/src/main/java/net/minecraft/server/ContainerGrindstone.java
 @@ -57,12 +57,24 @@ public class ContainerGrindstone extends Container {
@@ -51,10 +51,10 @@ index ed88e208d0..0a5abd2e10 100644
                  Map<Enchantment, Integer> map = EnchantmentManager.a(itemstack);
                  Iterator iterator = map.entrySet().iterator();
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 4ed4161270..460145bab1 100644
+index 2b39d5ca2..e9801022e 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -540,6 +540,12 @@ public final class ItemStack {
+@@ -541,6 +541,12 @@ public final class ItemStack {
          return !this.e() ? this.doMaterialsMatch(itemstack) : !itemstack.isEmpty() && this.getItem() == itemstack.getItem();
      }
  
@@ -68,7 +68,7 @@ index 4ed4161270..460145bab1 100644
          return this.getItem().f(this);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 22df3577cc..0fa7faa996 100644
+index 7d3c5e176..73b0eec5a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,6 +1,7 @@