mirror of
https://github.com/moparisthebest/minetest
synced 2024-12-25 00:48:52 -05:00
Attempt to fix the big bug. Now server either stops sending map or mapgen starts generating CONTENT_IGNORE.
This commit is contained in:
parent
74ef5b8a42
commit
52ad5944c0
72
src/map.cpp
72
src/map.cpp
@ -2033,25 +2033,28 @@ void ServerMap::initBlockMake(mapgen::BlockMakeData *data, v3s16 blockpos)
|
|||||||
|
|
||||||
for(s16 y=-1; y<=1; y++)
|
for(s16 y=-1; y<=1; y++)
|
||||||
{
|
{
|
||||||
//MapBlock *block = createBlock(blockpos);
|
v3s16 p(blockpos.X+x, blockpos.Y+y, blockpos.Z+z);
|
||||||
|
//MapBlock *block = createBlock(p);
|
||||||
// 1) get from memory, 2) load from disk
|
// 1) get from memory, 2) load from disk
|
||||||
MapBlock *block = emergeBlock(blockpos, false);
|
MapBlock *block = emergeBlock(p, false);
|
||||||
// 3) create a blank one
|
// 3) create a blank one
|
||||||
if(block == NULL)
|
if(block == NULL)
|
||||||
block = createBlock(blockpos);
|
{
|
||||||
|
block = createBlock(p);
|
||||||
|
|
||||||
|
/*
|
||||||
|
Block gets sunlight if this is true.
|
||||||
|
|
||||||
|
Refer to the map generator heuristics.
|
||||||
|
*/
|
||||||
|
bool ug = mapgen::block_is_underground(data->seed, p);
|
||||||
|
block->setIsUnderground(ug);
|
||||||
|
}
|
||||||
|
|
||||||
// Lighting will not be valid after make_chunk is called
|
// Lighting will not be valid after make_chunk is called
|
||||||
block->setLightingExpired(true);
|
block->setLightingExpired(true);
|
||||||
// Lighting will be calculated
|
// Lighting will be calculated
|
||||||
//block->setLightingExpired(false);
|
//block->setLightingExpired(false);
|
||||||
|
|
||||||
/*
|
|
||||||
Block gets sunlight if this is true.
|
|
||||||
|
|
||||||
This should be set to true when the top side of a block
|
|
||||||
is completely exposed to the sky.
|
|
||||||
*/
|
|
||||||
block->setIsUnderground(false);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -2126,10 +2129,14 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data,
|
|||||||
assert(block);
|
assert(block);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Set is_underground flag for lighting with sunlight
|
Set is_underground flag for lighting with sunlight.
|
||||||
*/
|
|
||||||
|
Refer to map generator heuristics.
|
||||||
|
|
||||||
|
NOTE: This is done in initChunkMake
|
||||||
|
*/
|
||||||
|
//block->setIsUnderground(mapgen::block_is_underground(data->seed, blockpos));
|
||||||
|
|
||||||
block->setIsUnderground(mapgen::block_is_underground(data->seed, blockpos));
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Add sunlight to central block.
|
Add sunlight to central block.
|
||||||
@ -2160,6 +2167,13 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data,
|
|||||||
#if 1
|
#if 1
|
||||||
// Center block
|
// Center block
|
||||||
lighting_update_blocks.insert(block->getPos(), block);
|
lighting_update_blocks.insert(block->getPos(), block);
|
||||||
|
|
||||||
|
/*{
|
||||||
|
s16 x = 0;
|
||||||
|
s16 z = 0;
|
||||||
|
v3s16 p = block->getPos()+v3s16(x,1,z);
|
||||||
|
lighting_update_blocks[p] = getBlockNoCreateNoEx(p);
|
||||||
|
}*/
|
||||||
#endif
|
#endif
|
||||||
#if 0
|
#if 0
|
||||||
// All modified blocks
|
// All modified blocks
|
||||||
@ -2176,9 +2190,29 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data,
|
|||||||
lighting_update_blocks.insert(i.getNode()->getKey(),
|
lighting_update_blocks.insert(i.getNode()->getKey(),
|
||||||
i.getNode()->getValue());
|
i.getNode()->getValue());
|
||||||
}
|
}
|
||||||
|
/*// Also force-add all the upmost blocks for proper sunlight
|
||||||
|
for(s16 x=-1; x<=1; x++)
|
||||||
|
for(s16 z=-1; z<=1; z++)
|
||||||
|
{
|
||||||
|
v3s16 p = block->getPos()+v3s16(x,1,z);
|
||||||
|
lighting_update_blocks[p] = getBlockNoCreateNoEx(p);
|
||||||
|
}*/
|
||||||
#endif
|
#endif
|
||||||
updateLighting(lighting_update_blocks, changed_blocks);
|
updateLighting(lighting_update_blocks, changed_blocks);
|
||||||
|
|
||||||
|
/*
|
||||||
|
Set lighting to non-expired state in all of them.
|
||||||
|
This is cheating, but it is not fast enough if all of them
|
||||||
|
would actually be updated.
|
||||||
|
*/
|
||||||
|
for(s16 x=-1; x<=1; x++)
|
||||||
|
for(s16 y=-1; y<=1; y++)
|
||||||
|
for(s16 z=-1; z<=1; z++)
|
||||||
|
{
|
||||||
|
v3s16 p = block->getPos()+v3s16(x,y,z);
|
||||||
|
getBlockNoCreateNoEx(p)->setLightingExpired(false);
|
||||||
|
}
|
||||||
|
|
||||||
if(enable_mapgen_debug_info == false)
|
if(enable_mapgen_debug_info == false)
|
||||||
t.stop(true); // Hide output
|
t.stop(true); // Hide output
|
||||||
}
|
}
|
||||||
@ -2463,7 +2497,7 @@ MapBlock * ServerMap::emergeBlock(v3s16 p, bool allow_generate)
|
|||||||
|
|
||||||
{
|
{
|
||||||
MapBlock *block = getBlockNoCreateNoEx(p);
|
MapBlock *block = getBlockNoCreateNoEx(p);
|
||||||
if(block)
|
if(block && block->isDummy() == false)
|
||||||
return block;
|
return block;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4065,10 +4099,16 @@ void ManualMapVoxelManipulator::blitBackAll(
|
|||||||
i = m_loaded_blocks.getIterator();
|
i = m_loaded_blocks.getIterator();
|
||||||
i.atEnd() == false; i++)
|
i.atEnd() == false; i++)
|
||||||
{
|
{
|
||||||
|
v3s16 p = i.getNode()->getKey();
|
||||||
bool existed = i.getNode()->getValue();
|
bool existed = i.getNode()->getValue();
|
||||||
if(existed == false)
|
if(existed == false)
|
||||||
|
{
|
||||||
|
// The Great Bug was found using this
|
||||||
|
/*dstream<<"ManualMapVoxelManipulator::blitBackAll: "
|
||||||
|
<<"Inexistent ("<<p.X<<","<<p.Y<<","<<p.Z<<")"
|
||||||
|
<<std::endl;*/
|
||||||
continue;
|
continue;
|
||||||
v3s16 p = i.getNode()->getKey();
|
}
|
||||||
MapBlock *block = m_map->getBlockNoCreateNoEx(p);
|
MapBlock *block = m_map->getBlockNoCreateNoEx(p);
|
||||||
if(block == NULL)
|
if(block == NULL)
|
||||||
{
|
{
|
||||||
|
@ -242,7 +242,12 @@ bool MapBlock::propagateSunlight(core::map<v3s16, bool> & light_sources,
|
|||||||
// Check if node above block has sunlight
|
// Check if node above block has sunlight
|
||||||
try{
|
try{
|
||||||
MapNode n = getNodeParent(v3s16(x, MAP_BLOCKSIZE, z));
|
MapNode n = getNodeParent(v3s16(x, MAP_BLOCKSIZE, z));
|
||||||
if(n.d == CONTENT_IGNORE || n.getLight(LIGHTBANK_DAY) != LIGHT_SUN)
|
if(n.d == CONTENT_IGNORE)
|
||||||
|
{
|
||||||
|
// Trust heuristics
|
||||||
|
no_sunlight = is_underground;
|
||||||
|
}
|
||||||
|
else if(n.getLight(LIGHTBANK_DAY) != LIGHT_SUN)
|
||||||
{
|
{
|
||||||
no_sunlight = true;
|
no_sunlight = true;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user