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

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

1 files changed, 20 insertions, 20 deletions

diff --git a/Minecraft.World/SpringFeature.cpp b/Minecraft.World/SpringFeature.cpp
index f26f0084..c6fa5e9f 100644
--- a/Minecraft.World/SpringFeature.cpp
+++ b/Minecraft.World/SpringFeature.cpp
@@ -22,30 +22,30 @@ bool SpringFeature::place(Level *level, Random *random, int x, int y, int z)
 		}
 	}
 
-    if (level->getTile(x, y + 1, z) != Tile::rock_Id) return false;
-    if (level->getTile(x, y - 1, z) != Tile::rock_Id) return false;
+	if (level->getTile(x, y + 1, z) != Tile::stone_Id) return false;
+	if (level->getTile(x, y - 1, z) != Tile::stone_Id) return false;
 
-    if (level->getTile(x, y, z) != 0 && level->getTile(x, y, z) != Tile::rock_Id) return false;
+	if (level->getTile(x, y, z) != 0 && level->getTile(x, y, z) != Tile::stone_Id) return false;
 
-    int rockCount = 0;
-    if (level->getTile(x - 1, y, z) == Tile::rock_Id) rockCount++;
-    if (level->getTile(x + 1, y, z) == Tile::rock_Id) rockCount++;
-    if (level->getTile(x, y, z - 1) == Tile::rock_Id) rockCount++;
-    if (level->getTile(x, y, z + 1) == Tile::rock_Id) rockCount++;
+	int rockCount = 0;
+	if (level->getTile(x - 1, y, z) == Tile::stone_Id) rockCount++;
+	if (level->getTile(x + 1, y, z) == Tile::stone_Id) rockCount++;
+	if (level->getTile(x, y, z - 1) == Tile::stone_Id) rockCount++;
+	if (level->getTile(x, y, z + 1) == Tile::stone_Id) rockCount++;
 
-    int holeCount = 0;
-    if (level->isEmptyTile(x - 1, y, z)) holeCount++;
-    if (level->isEmptyTile(x + 1, y, z)) holeCount++;
-    if (level->isEmptyTile(x, y, z - 1)) holeCount++;
-    if (level->isEmptyTile(x, y, z + 1)) holeCount++;
+	int holeCount = 0;
+	if (level->isEmptyTile(x - 1, y, z)) holeCount++;
+	if (level->isEmptyTile(x + 1, y, z)) holeCount++;
+	if (level->isEmptyTile(x, y, z - 1)) holeCount++;
+	if (level->isEmptyTile(x, y, z + 1)) holeCount++;
 
-    if (rockCount == 3 && holeCount == 1)
+	if (rockCount == 3 && holeCount == 1)
 	{
-        level->setTile(x, y, z, tile);
-        level->setInstaTick(true);
-        Tile::tiles[tile]->tick(level, x, y, z, random);
-        level->setInstaTick(false);
-    }
+		level->setTileAndData(x, y, z, tile, 0, Tile::UPDATE_CLIENTS);
+		level->setInstaTick(true);
+		Tile::tiles[tile]->tick(level, x, y, z, random);
+		level->setInstaTick(false);
+	}
 
-    return true;
+	return true;
 }
\ No newline at end of file