diff --git a/Paper b/Paper
index 0585f99b0..8782be3bb 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 0585f99b0522761871fb714f4a64f39acc1451b2
+Subproject commit 8782be3bb06ad804d76b547e0636f568f4779bf4
diff --git a/current-paper b/current-paper
index 62eda80b1..35d9ee3f8 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.15--8b51aa46e59916c955e527b8af8abc731c42c18d
+1.15--21d81dab7dbf6a0278f148de3ee6c9984a72149e
diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch
index 370cbb8af..0f3558c92 100644
--- a/patches/server/0001-Rebrand.patch
+++ b/patches/server/0001-Rebrand.patch
@@ -1,4 +1,4 @@
-From 22b94a39b6069106fd8525f79d1c009e85bfef80 Mon Sep 17 00:00:00 2001
+From 9af56364f87ffd81d371289b05eb125849562eb0 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
@@ -233,7 +233,7 @@ index f3da3a82d9..8f4ca4c285 100644
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 21bfdf9e71..65929255d5 100644
+index ab5c6e92ea..1580640ae3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -296,7 +296,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -243,8 +243,8 @@ index 21bfdf9e71..65929255d5 100644
 -        return new com.destroystokyo.paper.PaperVersionFetcher();
 +        return new net.pl3x.purpur.PurpurVersionFetcher();
      }
-     // Paper end
  
+     @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 index 674096cab1..e9aee2d8a9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
diff --git a/patches/server/0071-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0071-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 92db070cc..d603f54ad 100644
--- a/patches/server/0071-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0071-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -1,4 +1,4 @@
-From 654dcb8b77c0ceeba21978e364d7f5fa2b718511 Mon Sep 17 00:00:00 2001
+From 5a47000c9ce9d1ac1213234eae21c92cb706e9e5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 01:42:50 -0500
 Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
  2 files changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 46b0c68207..5ec70c4e3b 100644
+index d7f642858d..94664ea6c4 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1387,8 +1387,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1390,8 +1390,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          return blockposition;
      }