Skip to content

fix bed placement bug #9431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
outlineutils wants to merge 1 commit into from
Closed

fix bed placement bug #9431

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions patches/server/0984-Fix-bed-placement-incorrect-hitbox-check.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: JNI <admin@hydraclient.com>
Date: Fri, 30 Jun 2023 22:16:16 -0400
Subject: [PATCH] Fix-bed-placement-incorrect-hitbox-check


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 d40500f9a807cab0b2fb6fa9032f33f4fb74c895..43a8d758d795748fe1f705d1ce864b46c9d28c2e 100644
--- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
@@ -233,6 +233,14 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
BlockPos blockposition1 = blockposition.relative(enumdirection);
Level world = ctx.getLevel();

+ // Paper start
+ Player entityhuman = ctx.getPlayer();
+ CollisionContext voxelshapecollision = entityhuman == null ? CollisionContext.empty() : CollisionContext.of(entityhuman);
+ if(!world.checkEntityCollision(this.defaultBlockState().setValue(BedBlock.FACING, enumdirection), entityhuman, voxelshapecollision, blockposition1, true)) { // check collision in the head block too (fix MC-123619)
+ return null;
+ }
+ // Paper end
+
return world.getBlockState(blockposition1).canBeReplaced(ctx) && world.getWorldBorder().isWithinBounds(blockposition1) ? (BlockState) this.defaultBlockState().setValue(BedBlock.FACING, enumdirection) : null;
}