diff --git a/Paper b/Paper
index 83c89d7af..bfa122ae6 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 83c89d7afc92d98286121deca9f923106abadcc8
+Subproject commit bfa122ae6af5a6d5c50362baad6d48ca45a27e0f
diff --git a/current-paper b/current-paper
index 5494b131f..c58b9f645 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.16.4--d2bbd0bffbf55522a72f1fcb7556c33f0484ec8d
+1.16.4--4318585433dbbe9b6b1219e1dd59ddaa63d991a0
diff --git a/patches/server/0148-Expose-world-spawn-angle.patch b/patches/server/0148-Expose-world-spawn-angle.patch
deleted file mode 100644
index 82c85e4f1..000000000
--- a/patches/server/0148-Expose-world-spawn-angle.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
-Date: Tue, 17 Nov 2020 19:13:09 +0200
-Subject: [PATCH] Expose world spawn angle
-
-
-diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 8798660225..7b385eb43e 100644
---- a/src/main/java/net/minecraft/server/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -813,7 +813,7 @@ public abstract class PlayerList {
-             if (location == null) {
-                 worldserver1 = this.server.getWorldServer(World.OVERWORLD);
-                 blockposition = entityplayer1.getSpawnPoint(worldserver1);
--                location = new Location(worldserver1.getWorld(), (double) ((float) blockposition.getX() + 0.5F), (double) ((float) blockposition.getY() + 0.1F), (double) ((float) blockposition.getZ() + 0.5F));
-+                location = new Location(worldserver1.getWorld(), (double) ((float) blockposition.getX() + 0.5F), (double) ((float) blockposition.getY() + 0.1F), (double) ((float) blockposition.getZ() + 0.5F), worldserver1.worldData.getSpawnAngle(), 0.0F); // Paper - use world spawn angle
-             }
- 
-             Player respawnPlayer = cserver.getPlayer(entityplayer1);
-diff --git a/src/main/java/net/minecraft/server/WorldData.java b/src/main/java/net/minecraft/server/WorldData.java
-index faf931785e..14e1762bf8 100644
---- a/src/main/java/net/minecraft/server/WorldData.java
-+++ b/src/main/java/net/minecraft/server/WorldData.java
-@@ -8,6 +8,7 @@ public interface WorldData {
- 
-     int c();
- 
-+    default float getSpawnAngle() { return d(); } // Paper - OBFHELPER
-     float d();
- 
-     long getTime();
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2028db6da4..ae2cc01c10 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -387,7 +387,7 @@ public class CraftWorld implements World {
-     @Override
-     public Location getSpawnLocation() {
-         BlockPosition spawn = world.getSpawn();
--        return new Location(this, spawn.getX(), spawn.getY(), spawn.getZ());
-+        return new Location(this, spawn.getX(), spawn.getY(), spawn.getZ(), world.worldData.getSpawnAngle(), 0.0F); // Paper - expose world spawn angle
-     }
- 
-     @Override