1
0

Fix merge conflicts

This commit is contained in:
Howaner 2014-03-27 23:21:04 +01:00
parent 327b70e769
commit 8301f479bb

View File

@ -1384,13 +1384,6 @@ void cChunkMap::ReplaceTreeBlocks(const sSetBlockVector & a_Blocks)
}
break;
}
case E_BLOCK_NEW_LEAVES:
{
if (itr->BlockType == E_BLOCK_NEW_LOG)
{
Chunk->SetBlock(itr->x, itr->y, itr->z, itr->BlockType, itr->BlockMeta);
}
}
}
} // for itr - a_Blocks[]
}