single houses may intersect in their village area, but not villages

This commit is contained in:
Sokomine 2015-03-13 05:44:47 +01:00
parent 7fc6f5fc5e
commit ed75b5d43f

View File

@ -806,11 +806,12 @@ mg_villages.house_in_mapchunk_mark_intersection = function( villages, c, vnoise
end
end
if( mg_villages.inside_village_area( c.vx, c.vz, v, vnoise)
if( not( v.is_single_house ) and
( mg_villages.inside_village_area( c.vx, c.vz, v, vnoise)
or mg_villages.inside_village_area( bx, bz, v, vnoise)
or mg_villages.inside_village_area((bx+bsizex), bz, v, vnoise)
or mg_villages.inside_village_area((bx+bsizex), (bz+bsizez), v, vnoise)
or mg_villages.inside_village_area( bx, (bz+bsizez), v, vnoise)) then
or mg_villages.inside_village_area( bx, (bz+bsizez), v, vnoise))) then
mg_villages.print( mg_villages.DEBUG_LEVEL_WARNING, 'DROPPING house at '..c.vx..':'..c.vz..' due to intersection with village at '..id);
c.areas_intersect = 1;