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

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

1 files changed, 12 insertions, 11 deletions

diff --git a/Minecraft.World/FlowerFeature.cpp b/Minecraft.World/FlowerFeature.cpp
index 3fd8bac4..f24d61bf 100644
--- a/Minecraft.World/FlowerFeature.cpp
+++ b/Minecraft.World/FlowerFeature.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "net.minecraft.world.level.h"
+#include "net.minecraft.world.level.dimension.h"
 #include "FlowerFeature.h"
 #include "net.minecraft.world.level.tile.h"
 
@@ -22,19 +23,19 @@ bool FlowerFeature::place(Level *level, Random *random, int x, int y, int z)
 		}
 	}
 
-    for (int i = 0; i < 64; i++)
+	for (int i = 0; i < 64; 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 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) && (!level->dimension->hasCeiling || y2 < Level::genDepthMinusOne))
 		{
-            if (Tile::tiles[tile]->canSurvive(level, x2, y2, z2))
+			if (Tile::tiles[tile]->canSurvive(level, x2, y2, z2))
 			{
-                level->setTileNoUpdate(x2, y2, z2, tile);
-            }
-        }
-    }
+				level->setTileAndData(x2, y2, z2, tile, 0, Tile::UPDATE_CLIENTS);
+			}
+		}
+	}
 
-    return true;
+	return true;
 }
\ No newline at end of file