1 files changed, 33 insertions, 0 deletions
diff --git a/patches/server/0859-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0859-Fix-a-couple-of-upstream-bed-issues.patch
new file mode 100644
index 0000000000..6740daf4d1
--- /dev/null
+++ b/patches/server/0859-Fix-a-couple-of-upstream-bed-issues.patch
@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sun, 9 Apr 2023 21:11:58 -0700
+Subject: [PATCH] Fix a couple of upstream bed issues
+
+Upstream incorrectly skipped explosion logic if
+the bed was occupied and added a "feature" where
+if you set your spawn in a respawn anchor world
+but then replaced it with a bed, you could respawn
+at the bed in that world.
+
+diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
+index c14cddd42c61512c312231b1e93ccc6efbde620c..38fcde81d797dc46409f5a9ed426fe296d79bdfa 100644
+--- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
+@@ -109,6 +109,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
+                 world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK); // Paper - add exploded state
+                 return InteractionResult.SUCCESS;
+             } else if ((Boolean) state.getValue(BedBlock.OCCUPIED)) {
++                if (!BedBlock.canSetSpawn(world)) return this.explodeBed(state, world, pos); // Paper - check explode first
+                 if (!this.kickVillagerOutOfBed(world, pos)) {
+                     player.displayClientMessage(Component.translatable("block.minecraft.bed.occupied"), true);
+                 }
+@@ -166,8 +167,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
+     // CraftBukkit end
+ 
+     public static boolean canSetSpawn(Level world) {
+-        // CraftBukkit - moved world and biome check into EntityHuman
+-        return true || world.dimensionType().bedWorks();
++        return world.dimensionType().bedWorks(); // Paper - actually check if the bed works
+     }
+ 
+     private boolean kickVillagerOutOfBed(Level world, BlockPos pos) {