Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 10:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Voxelmanip: Do not emerge or blit to blocks over map gen limit

Browse Source 
Placing a structure that extends into mapblocks that extend past
map_gen_limit causes a crash. For example a sapling growing at the
world edge which adds leaves beyond the edge, or placing a structure
using the lua voxelmanip, or placing a schematic or l-system tree.

Do not run the 'load_if_inexistent' block of code if the mapblock
is over limit, this also marks the mapblock with the flag
VMANIP_BLOCK_DATA_INEXIST which later prevents blitting back those
mapblocks.

This fix therefore uses existing functionality by having the same
effect as the 'load_if_inexistent' bool being false.
This commit is contained in:
paramat 2017-02-17 15:50:51 +00:00
parent d0a6cacd51
commit 111e7e1cc8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map.cpp
View File

@ -3161,7 +3161,7 @@ void MMVManip::initialEmerge(v3s16 blockpos_min, v3s16 blockpos_max,
if(block_data_inexistent) if(block_data_inexistent)
{ {
if (load_if_inexistent) { if (load_if_inexistent && !blockpos_over_limit(p)) {
ServerMap *svrmap = (ServerMap *)m_map; ServerMap *svrmap = (ServerMap *)m_map;
block = svrmap->emergeBlock(p, false); block = svrmap->emergeBlock(p, false);
if (block == NULL) if (block == NULL)