diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-03-20 00:06:39 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-03-20 00:06:39 +0100 |
| commit | 0524d70774f830b08abb1dee4e8340b25c569d2a (patch) | |
| tree | f13a38847167ace3b627abb50aabb66fe56d86ed /src/World.cpp | |
| parent | Merge branch 'master' into awesometnt (diff) | |
| download | cuberite-0524d70774f830b08abb1dee4e8340b25c569d2a.tar cuberite-0524d70774f830b08abb1dee4e8340b25c569d2a.tar.gz cuberite-0524d70774f830b08abb1dee4e8340b25c569d2a.tar.bz2 cuberite-0524d70774f830b08abb1dee4e8340b25c569d2a.tar.lz cuberite-0524d70774f830b08abb1dee4e8340b25c569d2a.tar.xz cuberite-0524d70774f830b08abb1dee4e8340b25c569d2a.tar.zst cuberite-0524d70774f830b08abb1dee4e8340b25c569d2a.zip | |
Diffstat (limited to 'src/World.cpp')
| -rw-r--r-- | src/World.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/World.cpp b/src/World.cpp index 22bc406e0..01281625a 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -577,15 +577,15 @@ void cWorld::Start(void) m_IsSugarcaneBonemealable = IniFile.GetValueSetB("Plants", "IsSugarcaneBonemealable", false); m_IsDeepSnowEnabled = IniFile.GetValueSetB("Physics", "DeepSnow", true); m_ShouldLavaSpawnFire = IniFile.GetValueSetB("Physics", "ShouldLavaSpawnFire", true); - m_TNTShrapnelLevel = IniFile.GetValueSetI("Physics", "TNTShrapnelLevel", 2); + m_TNTShrapnelLevel = (eShrapnelLevel)IniFile.GetValueSetI("Physics", "TNTShrapnelLevel", 2); m_bCommandBlocksEnabled = IniFile.GetValueSetB("Mechanics", "CommandBlocksEnabled", false); m_bEnabledPVP = IniFile.GetValueSetB("Mechanics", "PVPEnabled", true); m_bUseChatPrefixes = IniFile.GetValueSetB("Mechanics", "UseChatPrefixes", true); m_VillagersShouldHarvestCrops = IniFile.GetValueSetB("Monsters", "VillagersShouldHarvestCrops", true); m_GameMode = (eGameMode)IniFile.GetValueSetI("General", "Gamemode", m_GameMode); - if (m_TNTShrapnelLevel > 2) - m_TNTShrapnelLevel = 2; + if (m_TNTShrapnelLevel > slAll) + m_TNTShrapnelLevel = slAll; // Load allowed mobs: const char * DefaultMonsters = ""; |