X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2FServerState.cpp;fp=src%2Fserver%2FServerState.cpp;h=e16872ffe74c094030ace36c87a92a7c566cfcfa;hb=9240fdf2e68ee014da0d0a89a7fb2f29ebf28e2d;hp=e6c031f8faea00c1366a131406c389293859b5d0;hpb=825f479edf9867938b6789215ad7ae6303596cba;p=blank.git diff --git a/src/server/ServerState.cpp b/src/server/ServerState.cpp index e6c031f..e16872f 100644 --- 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, block_types) +, generator(gc) , chunk_loader(world.Chunks(), generator, ws) , skeletons() , spawner(world, skeletons, env.rng) @@ -29,7 +29,7 @@ ServerState::ServerState( , loop_timer(16) { TextureIndex tex_index; env.loader.LoadBlockTypes("default", block_types, tex_index); - generator.Scan(); + generator.LoadTypes(block_types); skeletons.LoadHeadless(); spawner.LimitSkeletons(1, skeletons.size()); server.SetPlayerModel(skeletons[0]);