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

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

1 files changed, 16 insertions, 2 deletions

diff --git a/Minecraft.World/ExtremeHillsBiome.cpp b/Minecraft.World/ExtremeHillsBiome.cpp
index 7e62c7d3..26d97dd4 100644
--- a/Minecraft.World/ExtremeHillsBiome.cpp
+++ b/Minecraft.World/ExtremeHillsBiome.cpp
@@ -1,13 +1,20 @@
 #include "stdafx.h"
 #include "net.minecraft.world.level.h"
 #include "net.minecraft.world.level.tile.h"
+#include "net.minecraft.world.level.levelgen.feature.h"
 #include "ExtremeHillsBiome.h"
 
 ExtremeHillsBiome::ExtremeHillsBiome(int id) : Biome(id)
 {
+	silverfishFeature = new OreFeature(Tile::monsterStoneEgg_Id, 8);
 	friendlies.clear();
 }
 
+ExtremeHillsBiome::~ExtremeHillsBiome()
+{
+	delete silverfishFeature;
+}
+
 void ExtremeHillsBiome::decorate(Level *level, Random *random, int xo, int zo) {
 	Biome::decorate(level, random, xo, zo);
 
@@ -20,11 +27,18 @@ void ExtremeHillsBiome::decorate(Level *level, Random *random, int xo, int zo) {
 			int y = random->nextInt((Level::genDepth / 4) - 4) + 4;
 			int z = zo + random->nextInt(16);
 			int tile = level->getTile(x, y, z);
-			if (tile == Tile::rock_Id)
+			if (tile == Tile::stone_Id)
 			{
-				level->setTileNoUpdate(x, y, z, Tile::emeraldOre_Id);
+				level->setTileAndData(x, y, z, Tile::emeraldOre_Id, 0, Tile::UPDATE_CLIENTS);
 			}
 		}
 	}
 
+	for (int i = 0; i < 7; i++)
+	{
+		int x = xo + random->nextInt(16);
+		int y = random->nextInt(Level::genDepth / 2);
+		int z = zo + random->nextInt(16);
+		silverfishFeature->place(level, random, x, y, z);
+	}
 }