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

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

1 files changed, 27 insertions, 1 deletions

diff --git a/Minecraft.World/MineShaftFeature.cpp b/Minecraft.World/MineShaftFeature.cpp
index ac4d0c3f..78178de0 100644
--- a/Minecraft.World/MineShaftFeature.cpp
+++ b/Minecraft.World/MineShaftFeature.cpp
@@ -1,6 +1,32 @@
 #include "stdafx.h"
 #include "net.minecraft.world.level.levelgen.structure.h"
 #include "JavaMath.h"
+#include "Mth.h"
+
+const wstring MineShaftFeature::OPTION_CHANCE = L"chance";
+
+MineShaftFeature::MineShaftFeature()
+{
+	chance = 0.01;
+}
+
+wstring MineShaftFeature::getFeatureName()
+{
+	return L"Mineshaft";
+}
+
+MineShaftFeature::MineShaftFeature(unordered_map<wstring, wstring> options)
+{
+	chance = 0.01;
+
+	for(AUTO_VAR(it,options.begin()); it != options.end(); ++it)
+	{
+		if (it->first.compare(OPTION_CHANCE) == 0)
+		{
+			chance = Mth::getDouble(it->second, chance);
+		}
+	}
+}
 
 bool MineShaftFeature::isFeatureChunk(int x, int z, bool bIsSuperflat)
 {
@@ -11,7 +37,7 @@ bool MineShaftFeature::isFeatureChunk(int x, int z, bool bIsSuperflat)
 		forcePlacement = levelGenOptions->isFeatureChunk(x,z,eFeature_Mineshaft);
 	}
 
-	return forcePlacement || (random->nextInt(100) == 0 && random->nextInt(80) < max(abs(x), abs(z)));
+	return forcePlacement || (random->nextDouble() < chance && random->nextInt(80) < max(abs(x), abs(z)));
 }
 
 StructureStart *MineShaftFeature::createStructureStart(int x, int z)