diff --git a/Paper b/Paper
index 4ed5ab7c7..92933b162 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 4ed5ab7c792586ef022528322f09967d734f60a3
+Subproject commit 92933b162cb92d64ecb9d99ba82f0654a3128beb
diff --git a/current-paper b/current-paper
index 0ea867866..d99117700 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.15.1--9510ce02cd7105842c05a8dbe5271cf900770cc5
+1.15.1--d96dd4775b8bf9bb1adb223f3a1fecf7a3a3388a
diff --git a/patches/server/0020-Allow-color-codes-on-signs.patch b/patches/server/0020-Allow-color-codes-on-signs.patch
index eff478625..c43f5b7e8 100644
--- a/patches/server/0020-Allow-color-codes-on-signs.patch
+++ b/patches/server/0020-Allow-color-codes-on-signs.patch
@@ -1,4 +1,4 @@
-From 0a2af1d4016d00efd921c419bf60fa80a5797c5d Mon Sep 17 00:00:00 2001
+From c4340b134f7c320cb3f98d3741fe777abe9f0703 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 17:40:30 -0500
 Subject: [PATCH] Allow color codes on signs
@@ -11,10 +11,10 @@ Subject: [PATCH] Allow color codes on signs
  4 files changed, 28 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 0888f268f..88b3d295b 100644
+index 1ec29f157..2d2c916e5 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1093,6 +1093,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1092,6 +1092,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      @Override
      public void openSign(TileEntitySign tileentitysign) {
          tileentitysign.a((EntityHuman) this);
diff --git a/patches/server/0039-Players-should-not-cram-to-death.patch b/patches/server/0039-Players-should-not-cram-to-death.patch
index 50e4fc102..20fe1a855 100644
--- a/patches/server/0039-Players-should-not-cram-to-death.patch
+++ b/patches/server/0039-Players-should-not-cram-to-death.patch
@@ -1,4 +1,4 @@
-From 11e0c0ebeca0da8201ebbe185cf78192fa2993b3 Mon Sep 17 00:00:00 2001
+From e7dd733265b62aea814573a16366d94c82c89e2c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:01:46 -0500
 Subject: [PATCH] Players should not cram to death
@@ -8,10 +8,10 @@ Subject: [PATCH] Players should not cram to death
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 88b3d295b..65b1f657f 100644
+index 2d2c916e5..8565ad9c7 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1067,7 +1067,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1066,7 +1066,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isInvulnerable(DamageSource damagesource) {
diff --git a/patches/server/0050-Implement-AFK-API.patch b/patches/server/0050-Implement-AFK-API.patch
index fa39a7781..1ba07d29b 100644
--- a/patches/server/0050-Implement-AFK-API.patch
+++ b/patches/server/0050-Implement-AFK-API.patch
@@ -1,4 +1,4 @@
-From 56103c262c6b6c8963476f9c2b4feb4850ff7250 Mon Sep 17 00:00:00 2001
+From 97354fff32f4f7933175fe81fa397d5252871483 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 8 Aug 2019 15:29:15 -0500
 Subject: [PATCH] Implement AFK API
@@ -49,10 +49,10 @@ index 57c528d53..3c9f18096 100644
          super(EntityTypes.PLAYER, world);
          this.bV = ItemStack.a;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 65b1f657f..6ce35b48a 100644
+index 8565ad9c7..50a922ff1 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1584,8 +1584,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1583,8 +1583,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      public void resetIdleTimer() {
          this.cj = SystemUtils.getMonotonicMillis();