TakeV/Paper
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Resolve bed issues on unloaded chunks

Browse source
This commit is contained in:
chickeneer 2016-01-04 00:24:36 -06:00 committed by Zach Brown
parent d02fb4e971
commit 06ada7cc6d
1 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Spigot-Server-Patches/0079-SPIGOT-1387-Resolve-bed-issues-on-unloaded-chunks.patch Normal file
View file

@ -0,0 +1,31 @@
From 8acb6dbd2a55f6f8552315497030911a10e71284 Mon Sep 17 00:00:00 2001
From: chickeneer <emcchickeneer@gmail.com>
Date: Mon, 4 Jan 2016 00:19:32 -0600
Subject: [PATCH] SPIGOT-1387: Resolve bed issues on unloaded chunks
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index cc1e33c..0ad4edb 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1271,7 +1271,17 @@ public abstract class EntityHuman extends EntityLiving {
return this.world.getType(this.bx).getBlock() == Blocks.BED;
}
+ // PaperSpigot start - SPIGOT-1387: Resolve bed issues on unloaded chunks
public static BlockPosition getBed(World world, BlockPosition blockposition, boolean flag) {
+ boolean before = ((WorldServer) world).chunkProviderServer.forceChunkLoad;
+ ((WorldServer) world).chunkProviderServer.forceChunkLoad = true;
+ final BlockPosition result = getBed0(world, blockposition, flag);
+ ((WorldServer) world).chunkProviderServer.forceChunkLoad = before;
+ return result;
+ }
+
+ private static BlockPosition getBed0(World world, BlockPosition blockposition, boolean flag) {
+ // PaperSpigot end
((ChunkProviderServer) world.chunkProvider).getChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4); // CraftBukkit
Block block = world.getType(blockposition).getBlock();
--
2.6.4