mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-05 10:20:53 +01:00
526795bacd
* Update patches to handle vineflower decompiler * update patches again to handle inlined simple lambdas * update vf again and re-apply/rebuild patches * update patches after removal of verify-merges flag * fix compile issue * remove maven local * fix some issues * address more issues * fix collision patch * use paperweight release * more fixes * update fineflower and fix patches again * add missing comment descriptor --------- Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
21 lines
1.3 KiB
Diff
21 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Callahan <mr.callahhh@gmail.com>
|
|
Date: Mon, 13 Jan 2020 23:47:28 -0600
|
|
Subject: [PATCH] Prevent sync chunk loads when villagers try to find beds
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/SleepInBed.java b/src/main/java/net/minecraft/world/entity/ai/behavior/SleepInBed.java
|
|
index 6fe337e8d6db168ea181ed2597674f4829b03c47..e552ae6a7db765301a3d280dbf9348d9dc28b9c2 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/SleepInBed.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/SleepInBed.java
|
|
@@ -42,7 +42,8 @@ public class SleepInBed extends Behavior<LivingEntity> {
|
|
}
|
|
}
|
|
|
|
- BlockState blockState = world.getBlockState(globalPos.pos());
|
|
+ BlockState blockState = world.getBlockStateIfLoaded(globalPos.pos()); // Paper - Prevent sync chunk loads when villagers try to find beds
|
|
+ if (blockState == null) { return false; } // Paper - Prevent sync chunk loads when villagers try to find beds
|
|
return globalPos.pos().closerToCenterThan(entity.position(), 2.0) && blockState.is(BlockTags.BEDS) && !blockState.getValue(BedBlock.OCCUPIED);
|
|
}
|
|
}
|