diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-03 19:57:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-03 19:57:02 +0200 |
| commit | c6d54411056da2dd563015c9f90c4c5c0863bc71 (patch) | |
| tree | 5d3b6fcedf46ce066022dd575b9570352a50a0c1 /src/map.cpp | |
| parent | 72eec0f6f55b8515606de05d88717a78e978dd2a (diff) | |
| download | minetest-c6d54411056da2dd563015c9f90c4c5c0863bc71.tar.gz minetest-c6d54411056da2dd563015c9f90c4c5c0863bc71.tar.bz2 minetest-c6d54411056da2dd563015c9f90c4c5c0863bc71.zip | |
Properly remove SAO when worldedges are overtaken (#5889)
* LuaEntitySAO: Remove beyond outermost mapchunk edges
Based on a commit by, and with help from, nerzhul.
Add 2 functions to class Mapgen:
A function to calculate actual mapgen edges, called from the Mapgen constructor.
A function called indirectly from content_sao.cpp per entity step to check SAO
position is within mapgen edges.
* Calculate borders from params not mapgen, which is not available everytime
Diffstat (limited to 'src/map.cpp')
| -rw-r--r-- | src/map.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/map.cpp b/src/map.cpp index 641b7d2dd..3b02ac02f 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1378,6 +1378,11 @@ s16 ServerMap::getWaterLevel() return getMapgenParams()->water_level; } +bool ServerMap::saoPositionOverLimit(const v3f &p) +{ + return getMapgenParams()->saoPosOverLimit(p); +} + bool ServerMap::blockpos_over_mapgen_limit(v3s16 p) { const s16 mapgen_limit_bp = rangelim( @@ -1838,9 +1843,6 @@ MapBlock *ServerMap::getBlockOrEmerge(v3s16 p3d) return block; } -void ServerMap::prepareBlock(MapBlock *block) { -} - // N.B. This requires no synchronization, since data will not be modified unless // the VoxelManipulator being updated belongs to the same thread. void ServerMap::updateVManip(v3s16 pos) |