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

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

1 files changed, 14 insertions, 2 deletions

diff --git a/Minecraft.World/LevelSettings.cpp b/Minecraft.World/LevelSettings.cpp
index 59faa1ca..dca8ce61 100644
--- a/Minecraft.World/LevelSettings.cpp
+++ b/Minecraft.World/LevelSettings.cpp
@@ -47,10 +47,10 @@ void GameType::updatePlayerAbilities(Abilities *abilities)
 		abilities->invulnerable = false;
 		abilities->flying = false;
 	}
-	abilities->mayBuild = !isReadOnly();
+	abilities->mayBuild = !isAdventureRestricted();
 }
 
-bool GameType::isReadOnly()
+bool GameType::isAdventureRestricted()
 {
 	return this == ADVENTURE;
 }
@@ -95,6 +95,7 @@ void LevelSettings::_init(__int64 seed, GameType *gameType, bool generateMapFeat
 	this->levelType = levelType;
 	this->allowCommands = false;
 	this->startingBonusItems = false;
+	levelTypeOptions = L"";
 	m_xzSize = xzSize;
 	m_hellScale = hellScale;
 }
@@ -128,6 +129,12 @@ LevelSettings *LevelSettings::enableSinglePlayerCommands()
 	return this;
 }
 
+LevelSettings *LevelSettings::setLevelTypeOptions(const wstring &options)
+{
+	levelTypeOptions = options;
+	return this;
+}
+
 bool LevelSettings::hasStartingBonusItems()
 {
 	return startingBonusItems;
@@ -183,3 +190,8 @@ int LevelSettings::getHellScale()
 {
 	return m_hellScale;
 }
+
+wstring LevelSettings::getLevelTypeOptions()
+{
+	return levelTypeOptions;
+}
\ No newline at end of file