diff --git a/Paper b/Paper
index 5ce1dd48e..ccf1d5908 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 5ce1dd48e168c258d2fadba212f50db6fd5b7a2b
+Subproject commit ccf1d5908fb24dd56ff46ada6e45ae5c4fbb5845
diff --git a/current-paper b/current-paper
index 5655cef84..b72ce2ee5 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.15.2--f1111981a0c8d2a0c43ba485a8cbee39aeba2657
+1.15.2--74db7b6185982aa1e88f2d93b925caf983897435
diff --git a/patches/server/0032-Signs-allow-color-codes.patch b/patches/server/0032-Signs-allow-color-codes.patch
index 5ad785096..0a7c3ea5e 100644
--- a/patches/server/0032-Signs-allow-color-codes.patch
+++ b/patches/server/0032-Signs-allow-color-codes.patch
@@ -1,4 +1,4 @@
-From 6d602cf3031c13a71f4f25da90dbc35deb091784 Mon Sep 17 00:00:00 2001
+From 0573f00a8deb9cfa86e7829724a934c87be06f53 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] Signs allow color codes
@@ -23,10 +23,10 @@ index e7bfbc3307..a2f239b49e 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 108377d76e..fee512a479 100644
+index c6bd623921..5aada89c24 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2576,6 +2576,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2580,6 +2580,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
                  }
                  // Paper end
diff --git a/patches/server/0065-Alternative-Keepalive-Handling.patch b/patches/server/0065-Alternative-Keepalive-Handling.patch
index 381fd23ce..d337f2c78 100644
--- a/patches/server/0065-Alternative-Keepalive-Handling.patch
+++ b/patches/server/0065-Alternative-Keepalive-Handling.patch
@@ -1,4 +1,4 @@
-From 4bf642bdb0d7765344632746c4830da93bdf38d8 Mon Sep 17 00:00:00 2001
+From 54394aaf6481dad9ccbb1b5453a436a1c1897a3c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 11 Oct 2019 00:17:39 -0500
 Subject: [PATCH] Alternative Keepalive Handling
@@ -22,7 +22,7 @@ index 8e93f1540b..470f92c4fb 100644
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d897c7fd41..1f88262065 100644
+index 2f2e248c02..20cdd09f19 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -74,6 +74,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -55,7 +55,7 @@ index d897c7fd41..1f88262065 100644
          if (this.isPendingPing()) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                  PlayerConnection.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName()); // more info
-@@ -2669,6 +2685,17 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2673,6 +2689,17 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {