second attempt at "nice" client state correction

[blank.git] / src / app / ServerState.hpp

diff --git a/src/app/ServerState.hpp b/src/app/ServerState.hpp
index 5a3c0dcacaac7c1b9feb5ac52c3e89bdfb0b0434..db21d0fd3f643c3ca1a5a995321a9f1ee7615d36 100644 (file)
--- a/src/app/ServerState.hpp
+++ b/src/app/ServerState.hpp
@@ -3,14 +3,19 @@
 
 #include "IntervalTimer.hpp"
 #include "State.hpp"
+#include "../ai/Spawner.hpp"
+#include "../model/Skeletons.hpp"
 #include "../net/Server.hpp"
 #include "../world/BlockTypeRegistry.hpp"
+#include "../world/ChunkLoader.hpp"
+#include "../world/Generator.hpp"
 #include "../world/World.hpp"
 
 
 namespace blank {
 
 class HeadlessEnvironment;
+class WorldSave;
 
 class ServerState
 : public State {
@@ -18,6 +23,7 @@ class ServerState
 public:
        ServerState(
                HeadlessEnvironment &,
+               const Generator::Config &,
                const World::Config &,
                const WorldSave &,
                const Server::Config &
@@ -31,8 +37,12 @@ private:
        HeadlessEnvironment &env;
        BlockTypeRegistry block_types;
        World world;
+       Generator generator;
+       ChunkLoader chunk_loader;
+       Skeletons skeletons;
+       Spawner spawner;
        Server server;
-       IntervalTimer push_timer;
+       IntervalTimer loop_timer;
 
 };