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

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

1 files changed, 14 insertions, 14 deletions

diff --git a/Minecraft.World/CactusFeature.cpp b/Minecraft.World/CactusFeature.cpp
index 175c4ddb..13f5535a 100644
--- a/Minecraft.World/CactusFeature.cpp
+++ b/Minecraft.World/CactusFeature.cpp
@@ -5,23 +5,23 @@
 
 bool CactusFeature::place(Level *level, Random *random, int x, int y, int z)
 {
-    for (int i = 0; i < 10; i++) {
-        int x2 = x + random->nextInt(8) - random->nextInt(8);
-        int y2 = y + random->nextInt(4) - random->nextInt(4);
-        int z2 = z + random->nextInt(8) - random->nextInt(8);
-        if (level->isEmptyTile(x2, y2, z2))
+	for (int i = 0; i < 10; i++) {
+		int x2 = x + random->nextInt(8) - random->nextInt(8);
+		int y2 = y + random->nextInt(4) - random->nextInt(4);
+		int z2 = z + random->nextInt(8) - random->nextInt(8);
+		if (level->isEmptyTile(x2, y2, z2))
 		{
-            int h = 1 + random->nextInt(random->nextInt(3) + 1);
-            for (int yy = 0; yy < h; yy++)
+			int h = 1 + random->nextInt(random->nextInt(3) + 1);
+			for (int yy = 0; yy < h; yy++)
 			{
-                if (Tile::cactus->canSurvive(level, x2, y2+yy, z2))
+				if (Tile::cactus->canSurvive(level, x2, y2+yy, z2))
 				{
-                    level->setTileNoUpdate(x2, y2+yy, z2, Tile::cactus_Id);
-                }
-            }
-        }
-    }
+					level->setTileAndData(x2, y2+yy, z2, Tile::cactus_Id, 0, Tile::UPDATE_CLIENTS);
+				}
+			}
+		}
+	}
 
-    return true;
+	return true;
 }