Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 5 insertions, 3 deletions

diff --git a/Minecraft.World/BedItem.cpp b/Minecraft.World/BedItem.cpp
index 1ff50c6c..a55f277e 100644
--- a/Minecraft.World/BedItem.cpp
+++ b/Minecraft.World/BedItem.cpp
@@ -14,6 +14,8 @@ BedItem::BedItem(int id) : Item( id )
 
 bool BedItem::useOn(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player, Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly)
 {
+	if (level->isClientSide) return true;
+
 	if (face != Facing::UP)
 	{
 		return false;
@@ -33,21 +35,21 @@ bool BedItem::useOn(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> pl
 	if (dir == Direction::NORTH) zra = -1;
 	if (dir == Direction::EAST) xra = 1;
 
-	if (!player->mayBuild(x, y, z) || !player->mayBuild(x + xra, y, z + zra)) return false;
+	if (!player->mayUseItemAt(x, y, z, face, itemInstance) || !player->mayUseItemAt(x + xra, y, z + zra, face, itemInstance)) return false;
 
 	if (level->isEmptyTile(x, y, z) && level->isEmptyTile(x + xra, y, z + zra) && level->isTopSolidBlocking(x, y - 1, z) && level->isTopSolidBlocking(x + xra, y - 1, z + zra))
 	{
 		// 4J-PB - Adding a test only version to allow tooltips to be displayed
 		if(!bTestUseOnOnly)
 		{
-			level->setTileAndData(x, y, z, tile->id, dir);
+			level->setTileAndData(x, y, z, tile->id, dir, Tile::UPDATE_ALL);
 			// double-check that the bed was successfully placed
 			if (level->getTile(x, y, z) == tile->id)
 			{
 				// 4J-JEV: Hook for durango 'BlockPlaced' event.
 				player->awardStat(GenericStats::blocksPlaced(tile->id), GenericStats::param_blocksPlaced(tile->id,itemInstance->getAuxValue(),1));
 
-				level->setTileAndData(x + xra, y, z + zra, tile->id, dir + BedTile::HEAD_PIECE_DATA);
+				level->setTileAndData(x + xra, y, z + zra, tile->id, dir + BedTile::HEAD_PIECE_DATA, Tile::UPDATE_ALL);
 			}
 
 			itemInstance->count--;