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

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

1 files changed, 12 insertions, 51 deletions

diff --git a/Minecraft.World/StairTile.cpp b/Minecraft.World/StairTile.cpp
index 7a80e9ff..de2cc865 100644
--- a/Minecraft.World/StairTile.cpp
+++ b/Minecraft.World/StairTile.cpp
@@ -6,9 +6,9 @@
 #include "StairTile.h"
 
 int StairTile::DEAD_SPACES[8][2] = {
-            {2, 6}, {3, 7}, {2, 3}, {6, 7},
-            {0, 4}, {1, 5}, {0, 1}, {4, 5}
-    };
+	{2, 6}, {3, 7}, {2, 3}, {6, 7},
+	{0, 4}, {1, 5}, {0, 1}, {4, 5}
+};
 
 StairTile::StairTile(int id, Tile *base,int basedata) : Tile(id, base->material, isSolidRender())
 {
@@ -325,45 +325,6 @@ void StairTile::addAABBs(Level *level, int x, int y, int z, AABB *box, AABBList
 		}
 	}
 
-	//int data = level->getData(x, y, z);
-	//int dir = data & 0x3;
-	//float lowerPieceY0 = 0;
-	//float lowerPieceY1 = 0.5f;
-	//float upperPieceY0 = 0.5f;
-	//float upperPieceY1 = 1;
-
-	//if ((data & UPSIDEDOWN_BIT) != 0)
-	//{
-	//	lowerPieceY0 = .5f;
-	//	lowerPieceY1 = 1;
-	//	upperPieceY0 = 0;
-	//	upperPieceY1 = .5f;
-	//}
-
-	//setShape(0, lowerPieceY0, 0, 1, lowerPieceY1, 1);
-	//Tile::addAABBs(level, x, y, z, box, boxes);
-
-	//if (dir == 0)
-	//{
-	//	setShape(0.5f, upperPieceY0, 0, 1, upperPieceY1, 1);
-	//	Tile::addAABBs(level, x, y, z, box, boxes);
-	//}
-	//else if (dir == 1)
-	//{
-	//	setShape(0, upperPieceY0, 0, .5f, upperPieceY1, 1);
-	//	Tile::addAABBs(level, x, y, z, box, boxes);
-	//}
-	//else if (dir == 2)
-	//{
-	//	setShape(0, upperPieceY0, 0.5f, 1, upperPieceY1, 1);
-	//	Tile::addAABBs(level, x, y, z, box, boxes);
-	//}
-	//else if (dir == 3)
-	//{
-	//	setShape(0, upperPieceY0, 0, 1, upperPieceY1, .5f);
-	//	Tile::addAABBs(level, x, y, z, box, boxes);
-	//}
-
 	setShape(0, 0, 0, 1, 1, 1);
 }
 
@@ -416,9 +377,9 @@ Icon *StairTile::getTexture(int face, int data)
 	return base->getTexture(face, basedata);
 }
 
-int StairTile::getTickDelay()
+int StairTile::getTickDelay(Level *level)
 {
-	return base->getTickDelay();
+	return base->getTickDelay(level);
 }
 
 AABB *StairTile::getTileAABB(Level *level, int x, int y, int z)
@@ -485,20 +446,20 @@ bool StairTile::use(Level *level, int x, int y, int z, shared_ptr<Player> player
 	return base->use(level, x, y, z, player, 0, 0, 0, 0);
 }
 
-void StairTile::wasExploded(Level *level, int x, int y, int z)
+void StairTile::wasExploded(Level *level, int x, int y, int z, Explosion *explosion)
 {
-	base->wasExploded(level, x, y, z);
+	base->wasExploded(level, x, y, z, explosion);
 }
 
-void StairTile::setPlacedBy(Level *level, int x, int y, int z, shared_ptr<Mob> by)
+void StairTile::setPlacedBy(Level *level, int x, int y, int z, shared_ptr<LivingEntity> by, shared_ptr<ItemInstance> itemInstance)
 {
 	int dir = ( Mth::floor(by->yRot * 4 / (360) + 0.5) ) & 3;
 	int usd = level->getData(x, y, z) & UPSIDEDOWN_BIT;
 
-	if (dir == 0) level->setData(x, y, z, DIR_SOUTH | usd);
-	if (dir == 1) level->setData(x, y, z, DIR_WEST | usd);
-	if (dir == 2) level->setData(x, y, z, DIR_NORTH | usd);
-	if (dir == 3) level->setData(x, y, z, DIR_EAST | usd);
+	if (dir == 0) level->setData(x, y, z, DIR_SOUTH | usd, Tile::UPDATE_CLIENTS);
+	if (dir == 1) level->setData(x, y, z, DIR_WEST | usd, Tile::UPDATE_CLIENTS);
+	if (dir == 2) level->setData(x, y, z, DIR_NORTH | usd, Tile::UPDATE_CLIENTS);
+	if (dir == 3) level->setData(x, y, z, DIR_EAST | usd, Tile::UPDATE_CLIENTS);
 }
 
 int StairTile::getPlacedOnFaceDataValue(Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, int itemValue)