read preferences from user config file

[blank.git] / src / server / ServerState.cpp

diff --git a/src/server/ServerState.cpp b/src/server/ServerState.cpp
index 9020aa09473bdd3ec9f094e8fcab1578de4d9168..8c3f7e6196f92c5272cda3b61aa9128b825891c9 100644 (file)
--- a/src/server/ServerState.cpp
+++ b/src/server/ServerState.cpp
@@ -21,7 +21,7 @@ ServerState::ServerState(
 , block_types()
 , world(block_types, wc)
 , spawn_index(world.Chunks().MakeIndex(wc.spawn, 3))
-, generator(gc)
+, generator(gc, block_types)
 , chunk_loader(world.Chunks(), generator, ws)
 , skeletons()
 , spawner(world, skeletons, gc.seed)
@@ -29,6 +29,7 @@ ServerState::ServerState(
 , loop_timer(16) {
        TextureIndex tex_index;
        env.loader.LoadBlockTypes("default", block_types, tex_index);
+       generator.Scan();
        skeletons.LoadHeadless();
        spawner.LimitSkeletons(1, skeletons.Size());
        server.SetPlayerModel(skeletons[0]);