diff options
author | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-02-08 11:35:15 +0100 |
---|---|---|
committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-02-08 11:35:15 +0100 |
commit | 345eec5a2e3d60adb58e63185abd9b319d657765 (patch) | |
tree | 398522505d124f696735b07c82701b0829110158 /src/Root.h | |
parent | Merge pull request #2961 from LogicParrot/enforce (diff) | |
parent | remove cWorld::createAndInitializeWorld (diff) | |
download | cuberite-345eec5a2e3d60adb58e63185abd9b319d657765.tar cuberite-345eec5a2e3d60adb58e63185abd9b319d657765.tar.gz cuberite-345eec5a2e3d60adb58e63185abd9b319d657765.tar.bz2 cuberite-345eec5a2e3d60adb58e63185abd9b319d657765.tar.lz cuberite-345eec5a2e3d60adb58e63185abd9b319d657765.tar.xz cuberite-345eec5a2e3d60adb58e63185abd9b319d657765.tar.zst cuberite-345eec5a2e3d60adb58e63185abd9b319d657765.zip |
Diffstat (limited to 'src/Root.h')
-rw-r--r-- | src/Root.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/Root.h b/src/Root.h index 2ce0e7c32..24c8216d9 100644 --- a/src/Root.h +++ b/src/Root.h @@ -64,17 +64,8 @@ public: cServer * GetServer(void) { return m_Server; } cWorld * GetDefaultWorld(void); - /** Returns a pointer to the world specified - If no world of that name was currently loaded and a_SearchForFolder was true, it will consult cFile::IsFolder() to see if a world folder of that name exists and if so, initialise a world based on that name - */ - cWorld * GetWorld(const AString & a_WorldName, bool a_SearchForFolder = false); - - - /** Returns a pointer to a world of specified name - will search loaded worlds first, then create anew if not found - The dimension parameter is used to create a world with a specific dimension - a_OverworldName should be set for non-overworld dimensions if one wishes that world to link back to an overworld via portals - */ - cWorld * CreateAndInitializeWorld(const AString & a_WorldName, eDimension a_Dimension = dimOverworld, const AString & a_OverworldName = "", bool a_InitSpawn = true); + /** Returns a pointer to the world specified. If no world of that name exists, returns a nullptr. */ + cWorld * GetWorld(const AString & a_WorldName); /** Returns the up time of the server in seconds */ int GetServerUpTime(void) |