summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-04-26 01:26:24 +0200
committerarchshift <admin@archshift.com>2014-04-26 01:27:15 +0200
commit083cec5a09eed6e018a06734c44919419fe76620 (patch)
tree6c6b14820793f8d35b50b664c83a2d2d1f43e383 /src
parentMoved huge conditional out of InStateChasing(), improving readability (diff)
downloadcuberite-083cec5a09eed6e018a06734c44919419fe76620.tar
cuberite-083cec5a09eed6e018a06734c44919419fe76620.tar.gz
cuberite-083cec5a09eed6e018a06734c44919419fe76620.tar.bz2
cuberite-083cec5a09eed6e018a06734c44919419fe76620.tar.lz
cuberite-083cec5a09eed6e018a06734c44919419fe76620.tar.xz
cuberite-083cec5a09eed6e018a06734c44919419fe76620.tar.zst
cuberite-083cec5a09eed6e018a06734c44919419fe76620.zip
Diffstat (limited to 'src')
-rw-r--r--src/BlockID.cpp5
-rw-r--r--src/World.cpp15
2 files changed, 3 insertions, 17 deletions
diff --git a/src/BlockID.cpp b/src/BlockID.cpp
index 79e122032..bf95d0798 100644
--- a/src/BlockID.cpp
+++ b/src/BlockID.cpp
@@ -324,7 +324,7 @@ eDimension StringToDimension(const AString & a_DimensionString)
{ dimOverworld, "Normal"},
{ dimOverworld, "World"},
{ dimNether, "Nether"},
- { dimNether, "Hell"}, // Alternate name for End
+ { dimNether, "Hell"}, // Alternate name for Nether
{ dimEnd, "End"},
{ dimEnd, "Sky"}, // Old name for End
} ;
@@ -337,7 +337,8 @@ eDimension StringToDimension(const AString & a_DimensionString)
} // for i - DimensionMap[]
// Not found
- return (eDimension)-1000;
+ LOGWARNING("Unknown dimension: \"%s\". Setting to Overworld", a_DimensionString.c_str());
+ return dimOverworld;
}
diff --git a/src/World.cpp b/src/World.cpp
index 21cabe434..6582c1c07 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -518,21 +518,6 @@ void cWorld::Start(void)
}
AString Dimension = IniFile.GetValueSet("General", "Dimension", "Overworld");
m_Dimension = StringToDimension(Dimension);
- switch (m_Dimension)
- {
- case dimNether:
- case dimOverworld:
- case dimEnd:
- {
- break;
- }
- default:
- {
- LOGWARNING("Unknown dimension: \"%s\". Setting to Overworld", Dimension.c_str());
- m_Dimension = dimOverworld;
- break;
- }
- } // switch (m_Dimension)
// Try to find the "SpawnPosition" key and coord values in the world configuration, set the flag if found
int KeyNum = IniFile.FindKey("SpawnPosition");