summaryrefslogtreecommitdiffstats
path: root/src/Root.h
diff options
context:
space:
mode:
authorLogicParrot <LogicParrot@users.noreply.github.com>2016-02-08 11:06:14 +0100
committerLogicParrot <LogicParrot@users.noreply.github.com>2016-02-08 11:17:10 +0100
commit3efdfca61d2fbfb8e5cb5fb1f5b30ca27fe1cf56 (patch)
tree398522505d124f696735b07c82701b0829110158 /src/Root.h
parentMerge pull request #2961 from LogicParrot/enforce (diff)
downloadcuberite-3efdfca61d2fbfb8e5cb5fb1f5b30ca27fe1cf56.tar
cuberite-3efdfca61d2fbfb8e5cb5fb1f5b30ca27fe1cf56.tar.gz
cuberite-3efdfca61d2fbfb8e5cb5fb1f5b30ca27fe1cf56.tar.bz2
cuberite-3efdfca61d2fbfb8e5cb5fb1f5b30ca27fe1cf56.tar.lz
cuberite-3efdfca61d2fbfb8e5cb5fb1f5b30ca27fe1cf56.tar.xz
cuberite-3efdfca61d2fbfb8e5cb5fb1f5b30ca27fe1cf56.tar.zst
cuberite-3efdfca61d2fbfb8e5cb5fb1f5b30ca27fe1cf56.zip
Diffstat (limited to 'src/Root.h')
-rw-r--r--src/Root.h13
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)