diff options
| author | paramat <paramat@users.noreply.github.com> | 2017-06-04 22:28:32 +0100 |
|---|---|---|
| committer | paramat <mat.gregory@virginmedia.com> | 2017-06-11 02:11:08 +0100 |
| commit | 842acbfad2b70550c562f6429d02c980912d2273 (patch) | |
| tree | 8c17ebc69f973dcbf6bbd641251a9242dc010b83 /src/serverenvironment.cpp | |
| parent | a9f02ab51cd4b92a98d7b6dffe6d2838796ba9cc (diff) | |
| download | minetest-842acbfad2b70550c562f6429d02c980912d2273.tar.gz minetest-842acbfad2b70550c562f6429d02c980912d2273.tar.bz2 minetest-842acbfad2b70550c562f6429d02c980912d2273.zip | |
(Re)spawn players within 'mapgen_limit'
Previously, findSpawnPos() did not take the 'mapgen_limit' setting into account,
a small limit often resulted in a spawn out in the void.
Use the recently added 'calcMapgenEdges()' to get max spawn range through a new
mapgenParams function 'getSpawnRangeMax()'.
Previously, when a player respawned into a world, 'objectpos_over_limit()' was
used as a check, which was inaccurate.
Use the recently added 'saoPosOverLimit()' to get exact mapgen edges.
Also fix default value of 'm_sao_limit_min'.
Diffstat (limited to 'src/serverenvironment.cpp')
| -rw-r--r-- | src/serverenvironment.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp index f013a3cc7..7be958920 100644 --- a/src/serverenvironment.cpp +++ b/src/serverenvironment.cpp @@ -579,7 +579,8 @@ PlayerSAO *ServerEnvironment::loadPlayer(RemotePlayer *player, bool *new_player, // If the player exists, ensure that they respawn inside legal bounds // This fixes an assert crash when the player can't be added // to the environment - if (objectpos_over_limit(playersao->getBasePosition())) { + ServerMap &map = getServerMap(); + if (map.getMapgenParams()->saoPosOverLimit(playersao->getBasePosition())) { actionstream << "Respawn position for player \"" << player->getName() << "\" outside limits, resetting" << std::endl; playersao->setBasePosition(m_server->findSpawnPos()); |