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

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

1 files changed, 3 insertions, 0 deletions

diff --git a/Minecraft.World/CustomLevelSource.h b/Minecraft.World/CustomLevelSource.h
index af01a478..7739fc95 100644
--- a/Minecraft.World/CustomLevelSource.h
+++ b/Minecraft.World/CustomLevelSource.h
@@ -12,6 +12,7 @@ class LargeFeature;
 class StrongholdFeature;
 class VillageFeature;
 class MineShaftFeature;
+class RandomScatteredLargeFeature;
 
 class CustomLevelSource : public ChunkSource
 {
@@ -32,6 +33,7 @@ private:
  	StrongholdFeature *strongholdFeature;
  	VillageFeature *villageFeature;
  	MineShaftFeature *mineShaftFeature;
+	RandomScatteredLargeFeature *scatteredFeature;
  	LargeFeature *canyonFeature;
 	Level *level;
 #endif
@@ -76,4 +78,5 @@ public:
 public:
 	virtual vector<Biome::MobSpawnerData *> *getMobsAt(MobCategory *mobCategory, int x, int y, int z);
 	virtual TilePos *findNearestMapFeature(Level *level, const wstring& featureName, int x, int y, int z); 
+	virtual void recreateLogicStructuresForChunk(int chunkX, int chunkZ);
 };