summaryrefslogtreecommitdiff
path: root/src/serverenvironment.cpp
diff options
context:
space:
mode:
authorparamat <paramat@users.noreply.github.com>2018-02-20 19:32:24 +0000
committerSmallJoker <mk939@ymail.com>2018-06-03 17:32:00 +0200
commit8aaf526730a621ae6d8d2839730437b605d892e7 (patch)
treed23cf65c6cb1e30f774b008c251f65ad8b435558 /src/serverenvironment.cpp
parentc683e050d45285f38f822f04eeb65ad6c604c119 (diff)
downloadminetest-8aaf526730a621ae6d8d2839730437b605d892e7.tar.gz
minetest-8aaf526730a621ae6d8d2839730437b605d892e7.tar.bz2
minetest-8aaf526730a621ae6d8d2839730437b605d892e7.zip
SAO limits: Allow SAOs to exist outside the set 'mapgen limit'
Diffstat (limited to 'src/serverenvironment.cpp')
-rw-r--r--src/serverenvironment.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp
index e4fcf626d..8a66d4dfa 100644
--- a/src/serverenvironment.cpp
+++ b/src/serverenvironment.cpp
@@ -579,8 +579,7 @@ 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
- ServerMap &map = getServerMap();
- if (map.getMapgenParams()->saoPosOverLimit(playersao->getBasePosition())) {
+ if (objectpos_over_limit(playersao->getBasePosition())) {
actionstream << "Respawn position for player \""
<< player->getName() << "\" outside limits, resetting" << std::endl;
playersao->setBasePosition(m_server->findSpawnPos());