summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMat <mail@mathias.is>2020-03-26 18:06:15 +0100
committerGitHub <noreply@github.com>2020-03-26 18:06:15 +0100
commit195bebb4809fd96dd66ff440a2e1b3514227a223 (patch)
treef5c14078bd7984450895a2a6d1de0a55e6941bc1
parentFix nether mob spawning (#4546) (diff)
downloadcuberite-195bebb4809fd96dd66ff440a2e1b3514227a223.tar
cuberite-195bebb4809fd96dd66ff440a2e1b3514227a223.tar.gz
cuberite-195bebb4809fd96dd66ff440a2e1b3514227a223.tar.bz2
cuberite-195bebb4809fd96dd66ff440a2e1b3514227a223.tar.lz
cuberite-195bebb4809fd96dd66ff440a2e1b3514227a223.tar.xz
cuberite-195bebb4809fd96dd66ff440a2e1b3514227a223.tar.zst
cuberite-195bebb4809fd96dd66ff440a2e1b3514227a223.zip
-rw-r--r--src/World.cpp4
-rw-r--r--src/World.h2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/World.cpp b/src/World.cpp
index 13b544a78..d8655ce11 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -193,6 +193,7 @@ cWorld::cWorld(
m_MinThunderStormTicks(3600), // 3 real-world minutes -+
m_MaxCactusHeight(3),
m_MaxSugarcaneHeight(4),
+ /* TODO: Enable when functionality exists again
m_IsBeetrootsBonemealable(true),
m_IsCactusBonemealable(false),
m_IsCarrotsBonemealable(true),
@@ -207,6 +208,7 @@ cWorld::cWorld(
m_IsSugarcaneBonemealable(false),
m_IsBigFlowerBonemealable(true),
m_IsTallGrassBonemealable(true),
+ */
m_bCommandBlocksEnabled(true),
m_bUseChatPrefixes(false),
m_TNTShrapnelLevel(slNone),
@@ -282,6 +284,7 @@ cWorld::cWorld(
m_StorageCompressionFactor = IniFile.GetValueSetI("Storage", "CompressionFactor", m_StorageCompressionFactor);
m_MaxCactusHeight = IniFile.GetValueSetI("Plants", "MaxCactusHeight", 3);
m_MaxSugarcaneHeight = IniFile.GetValueSetI("Plants", "MaxSugarcaneHeight", 3);
+ /* TODO: Enable when functionality exists again
m_IsBeetrootsBonemealable = IniFile.GetValueSetB("Plants", "IsBeetrootsBonemealable", true);
m_IsCactusBonemealable = IniFile.GetValueSetB("Plants", "IsCactusBonemealable", false);
m_IsCarrotsBonemealable = IniFile.GetValueSetB("Plants", "IsCarrotsBonemealable", true);
@@ -296,6 +299,7 @@ cWorld::cWorld(
m_IsSugarcaneBonemealable = IniFile.GetValueSetB("Plants", "IsSugarcaneBonemealable", false);
m_IsBigFlowerBonemealable = IniFile.GetValueSetB("Plants", "IsBigFlowerBonemealable", true);
m_IsTallGrassBonemealable = IniFile.GetValueSetB("Plants", "IsTallGrassBonemealable", true);
+ */
m_IsDeepSnowEnabled = IniFile.GetValueSetB("Physics", "DeepSnow", true);
m_ShouldLavaSpawnFire = IniFile.GetValueSetB("Physics", "ShouldLavaSpawnFire", true);
int TNTShrapnelLevel = IniFile.GetValueSetI("Physics", "TNTShrapnelLevel", static_cast<int>(slAll));
diff --git a/src/World.h b/src/World.h
index 165578e07..7f6b1871d 100644
--- a/src/World.h
+++ b/src/World.h
@@ -1213,6 +1213,7 @@ private:
int m_MaxCactusHeight;
int m_MaxSugarcaneHeight;
+ /* TODO: Enable when functionality exists again
bool m_IsBeetrootsBonemealable;
bool m_IsCactusBonemealable;
bool m_IsCarrotsBonemealable;
@@ -1227,6 +1228,7 @@ private:
bool m_IsSugarcaneBonemealable;
bool m_IsBigFlowerBonemealable;
bool m_IsTallGrassBonemealable;
+ */
/** Whether command blocks are enabled or not */
bool m_bCommandBlocksEnabled;