flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Disable bonemealable settings for now (#4551)

Browse Source
This commit is contained in:
Mat 2020-03-26 19:06:15 +02:00 committed by GitHub
parent b7e88e2c9f
commit 195bebb480
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/World.cpp
View File

@ -193,6 +193,7 @@ cWorld::cWorld(
m_MinThunderStormTicks(3600), // 3 real-world minutes -+ m_MinThunderStormTicks(3600), // 3 real-world minutes -+
m_MaxCactusHeight(3), m_MaxCactusHeight(3),
m_MaxSugarcaneHeight(4), m_MaxSugarcaneHeight(4),
/* TODO: Enable when functionality exists again
m_IsBeetrootsBonemealable(true), m_IsBeetrootsBonemealable(true),
m_IsCactusBonemealable(false), m_IsCactusBonemealable(false),
m_IsCarrotsBonemealable(true), m_IsCarrotsBonemealable(true),
@ -207,6 +208,7 @@ cWorld::cWorld(
m_IsSugarcaneBonemealable(false), m_IsSugarcaneBonemealable(false),
m_IsBigFlowerBonemealable(true), m_IsBigFlowerBonemealable(true),
m_IsTallGrassBonemealable(true), m_IsTallGrassBonemealable(true),
*/
m_bCommandBlocksEnabled(true), m_bCommandBlocksEnabled(true),
m_bUseChatPrefixes(false), m_bUseChatPrefixes(false),
m_TNTShrapnelLevel(slNone), m_TNTShrapnelLevel(slNone),
@ -282,6 +284,7 @@ cWorld::cWorld(
m_StorageCompressionFactor = IniFile.GetValueSetI("Storage", "CompressionFactor", m_StorageCompressionFactor); m_StorageCompressionFactor = IniFile.GetValueSetI("Storage", "CompressionFactor", m_StorageCompressionFactor);
m_MaxCactusHeight = IniFile.GetValueSetI("Plants", "MaxCactusHeight", 3); m_MaxCactusHeight = IniFile.GetValueSetI("Plants", "MaxCactusHeight", 3);
m_MaxSugarcaneHeight = IniFile.GetValueSetI("Plants", "MaxSugarcaneHeight", 3); m_MaxSugarcaneHeight = IniFile.GetValueSetI("Plants", "MaxSugarcaneHeight", 3);
/* TODO: Enable when functionality exists again
m_IsBeetrootsBonemealable = IniFile.GetValueSetB("Plants", "IsBeetrootsBonemealable", true); m_IsBeetrootsBonemealable = IniFile.GetValueSetB("Plants", "IsBeetrootsBonemealable", true);
m_IsCactusBonemealable = IniFile.GetValueSetB("Plants", "IsCactusBonemealable", false); m_IsCactusBonemealable = IniFile.GetValueSetB("Plants", "IsCactusBonemealable", false);
m_IsCarrotsBonemealable = IniFile.GetValueSetB("Plants", "IsCarrotsBonemealable", true); m_IsCarrotsBonemealable = IniFile.GetValueSetB("Plants", "IsCarrotsBonemealable", true);
@ -296,6 +299,7 @@ cWorld::cWorld(
m_IsSugarcaneBonemealable = IniFile.GetValueSetB("Plants", "IsSugarcaneBonemealable", false); m_IsSugarcaneBonemealable = IniFile.GetValueSetB("Plants", "IsSugarcaneBonemealable", false);
m_IsBigFlowerBonemealable = IniFile.GetValueSetB("Plants", "IsBigFlowerBonemealable", true); m_IsBigFlowerBonemealable = IniFile.GetValueSetB("Plants", "IsBigFlowerBonemealable", true);
m_IsTallGrassBonemealable = IniFile.GetValueSetB("Plants", "IsTallGrassBonemealable", true); m_IsTallGrassBonemealable = IniFile.GetValueSetB("Plants", "IsTallGrassBonemealable", true);
*/
m_IsDeepSnowEnabled = IniFile.GetValueSetB("Physics", "DeepSnow", true); m_IsDeepSnowEnabled = IniFile.GetValueSetB("Physics", "DeepSnow", true);
m_ShouldLavaSpawnFire = IniFile.GetValueSetB("Physics", "ShouldLavaSpawnFire", true); m_ShouldLavaSpawnFire = IniFile.GetValueSetB("Physics", "ShouldLavaSpawnFire", true);
int TNTShrapnelLevel = IniFile.GetValueSetI("Physics", "TNTShrapnelLevel", static_cast<int>(slAll)); int TNTShrapnelLevel = IniFile.GetValueSetI("Physics", "TNTShrapnelLevel", static_cast<int>(slAll));

2
src/World.h
View File

@ -1213,6 +1213,7 @@ private:
int m_MaxCactusHeight; int m_MaxCactusHeight;
int m_MaxSugarcaneHeight; int m_MaxSugarcaneHeight;
/* TODO: Enable when functionality exists again
bool m_IsBeetrootsBonemealable; bool m_IsBeetrootsBonemealable;
bool m_IsCactusBonemealable; bool m_IsCactusBonemealable;
bool m_IsCarrotsBonemealable; bool m_IsCarrotsBonemealable;
@ -1227,6 +1228,7 @@ private:
bool m_IsSugarcaneBonemealable; bool m_IsSugarcaneBonemealable;
bool m_IsBigFlowerBonemealable; bool m_IsBigFlowerBonemealable;
bool m_IsTallGrassBonemealable; bool m_IsTallGrassBonemealable;
*/
/** Whether command blocks are enabled or not */ /** Whether command blocks are enabled or not */
bool m_bCommandBlocksEnabled; bool m_bCommandBlocksEnabled;