diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2014-01-06 21:17:19 -0500 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2014-01-06 21:25:10 -0500 |
| commit | 0fd5c61c00819ae3eaf298739e8cf879e2d43820 (patch) | |
| tree | f64a8217f350e3d733b0a025bc9ee614c6b5fd65 /src/server.cpp | |
| parent | c46574f30f31fc186087f05d9100845d44319795 (diff) | |
| download | minetest-0fd5c61c00819ae3eaf298739e8cf879e2d43820.tar.gz minetest-0fd5c61c00819ae3eaf298739e8cf879e2d43820.tar.bz2 minetest-0fd5c61c00819ae3eaf298739e8cf879e2d43820.zip | |
Revert "Improve (re)spawn, add cache_block_before_spawn and max_spawn_height settings"
The commit didn't work because the blocks weren't loaded yet.
This reverts commit 22dbbf0a6fc9547f0dbdb7f6076337b8c6acd48b.
Conflicts:
minetest.conf.example
Diffstat (limited to 'src/server.cpp')
| -rw-r--r-- | src/server.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/server.cpp b/src/server.cpp index 0b3eb31a6..d8bedb260 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2300,9 +2300,8 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) } /*infostream<<"Server::ProcessData(): Moved player "<<peer_id<<" to " - <<"("<<position.X<<","<<position.Y<<","<<position.Z<<")" - <<" pitch="<<pitch<<" yaw="<<yaw<<std::endl;*/ - + <<"("<<position.X<<","<<position.Y<<","<<position.Z<<")" + <<" pitch="<<pitch<<" yaw="<<yaw<<std::endl;*/ } else if(command == TOSERVER_GOTBLOCKS) { @@ -5336,10 +5335,10 @@ v3f findSpawnPos(ServerMap &map) -range + (myrand() % (range * 2))); // Get ground height at point - s16 groundheight = map.findGroundLevel(nodepos2d, g_settings->getBool("cache_block_before_spawn")); + s16 groundheight = map.findGroundLevel(nodepos2d); if (groundheight <= water_level) // Don't go underwater continue; - if (groundheight > water_level + g_settings->getS16("max_spawn_height")) // Don't go to high places + if (groundheight > water_level + 6) // Don't go to high places continue; nodepos = v3s16(nodepos2d.X, groundheight, nodepos2d.Y); |