OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 23:10:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix sleeping

Browse source
This commit is contained in:
Owen1212055 2024-12-15 20:52:03 -05:00
parent 2e14d98ebe
commit 59a1f78750
No known key found for this signature in database
GPG key ID: 2133292072886A30
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
paper-server/patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
View file

@ -825,15 +825,15 @@
this.enteredNetherPosition = null; this.enteredNetherPosition = null;
} }
} }
@@ -1110,16 +_,21 @@ @@ -1107,19 +_,18 @@
@Override this.containerMenu.broadcastChanges();
public Either<Player.BedSleepingProblem, Unit> startSleepInBed(BlockPos at) { }
Direction direction = this.level().getBlockState(at).getValue(HorizontalDirectionalBlock.FACING);
- @Override
- public Either<Player.BedSleepingProblem, Unit> startSleepInBed(BlockPos at) {
- Direction direction = this.level().getBlockState(at).getValue(HorizontalDirectionalBlock.FACING);
+ // CraftBukkit start - moved bed result checks from below into separate method + // CraftBukkit start - moved bed result checks from below into separate method
+ return getBedResult(at, direction);
+ }
+ private Either<Player.BedSleepingProblem, Unit> getBedResult(BlockPos at, Direction direction) { + private Either<Player.BedSleepingProblem, Unit> getBedResult(BlockPos at, Direction direction) {
+ // CraftBukkit end - moved bed result checks from below into separate method
if (this.isSleeping() || !this.isAlive()) { if (this.isSleeping() || !this.isAlive()) {
return Either.left(Player.BedSleepingProblem.OTHER_PROBLEM); return Either.left(Player.BedSleepingProblem.OTHER_PROBLEM);
- } else if (!this.level().dimensionType().natural()) { - } else if (!this.level().dimensionType().natural()) {