summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Pioch <lukas@zgow.de>2016-01-08 19:43:23 +0100
committerMattes D <github@xoft.cz>2016-01-12 10:18:24 +0100
commitfe72eaaec2b2c88c57d1ac64f527925127003bf8 (patch)
treebf31d7c92a8f1e96f3b7466fa2ef2d83725dde0b
parentMerge pull request #2821 from LogicParrot/world2 (diff)
downloadcuberite-fe72eaaec2b2c88c57d1ac64f527925127003bf8.tar
cuberite-fe72eaaec2b2c88c57d1ac64f527925127003bf8.tar.gz
cuberite-fe72eaaec2b2c88c57d1ac64f527925127003bf8.tar.bz2
cuberite-fe72eaaec2b2c88c57d1ac64f527925127003bf8.tar.lz
cuberite-fe72eaaec2b2c88c57d1ac64f527925127003bf8.tar.xz
cuberite-fe72eaaec2b2c88c57d1ac64f527925127003bf8.tar.zst
cuberite-fe72eaaec2b2c88c57d1ac64f527925127003bf8.zip
-rw-r--r--.gitignore1
-rw-r--r--Server/Plugins/APIDump/APIDesc.lua1
-rw-r--r--src/World.h3
3 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a25819b26..ea4ccdd59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,6 +88,7 @@ src/AllFiles.lst
*.opensdf
*.sdf
*.sln
+*.opendb
*.idb
# cmake output folders
diff --git a/Server/Plugins/APIDump/APIDesc.lua b/Server/Plugins/APIDump/APIDesc.lua
index 6f3736bef..b253626cd 100644
--- a/Server/Plugins/APIDump/APIDesc.lua
+++ b/Server/Plugins/APIDump/APIDesc.lua
@@ -2507,6 +2507,7 @@ end
GetName = { Params = "", Return = "string", Notes = "Returns the name of the world, as specified in the settings.ini file." },
GetNumChunks = { Params = "", Return = "number", Notes = "Returns the number of chunks currently loaded." },
GetScoreBoard = { Params = "", Return = "{{cScoreBoard}}", Notes = "Returns the {{cScoreBoard|ScoreBoard}} object used by this world. " },
+ GetSeed = { Params = "", Return = "number", Notes = "Returns the seed of the world." },
GetSignLines = { Params = "BlockX, BlockY, BlockZ", Return = "IsValid, [Line1, Line2, Line3, Line4]", Notes = "Returns true and the lines of a sign at the specified coords, or false if there is no sign at the coords." },
GetSpawnX = { Params = "", Return = "number", Notes = "Returns the X coord of the default spawn" },
GetSpawnY = { Params = "", Return = "number", Notes = "Returns the Y coord of the default spawn" },
diff --git a/src/World.h b/src/World.h
index e9206e176..95ac6b21b 100644
--- a/src/World.h
+++ b/src/World.h
@@ -757,6 +757,9 @@ public:
return (IsWeatherWet() && !IsBiomeNoDownfall(GetBiomeAt(a_BlockX, a_BlockZ)));
}
+ /** Returns the seed of the world. */
+ int GetSeed(void) { return m_Generator.GetSeed(); }
+
// tolua_end
cChunkGenerator & GetGenerator(void) { return m_Generator; }