X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2FServerState.hpp;h=fbf28e5768f71c7003fa5436b2e6aa48a0da9892;hb=660c4216fc61c0d99987adbfea057af07b511a23;hp=bfefccf397f0ae0be42a5ac6213bbd01b2d33eb1;hpb=3a487f44c26f9bb9d1a1c831406b6497b2b3b425;p=blank.git

diff --git a/src/server/ServerState.hpp b/src/server/ServerState.hpp
index bfefccf..fbf28e5 100644
--- a/src/server/ServerState.hpp
+++ b/src/server/ServerState.hpp
@@ -5,9 +5,7 @@
 #include "../ai/Spawner.hpp"
 #include "../app/IntervalTimer.hpp"
 #include "../app/State.hpp"
-#include "../model/ShapeRegistry.hpp"
-#include "../model/Skeletons.hpp"
-#include "../world/BlockTypeRegistry.hpp"
+#include "../shared/WorldResources.hpp"
 #include "../world/ChunkLoader.hpp"
 #include "../world/Generator.hpp"
 #include "../world/World.hpp"
@@ -40,12 +38,10 @@ public:
 
 private:
 	HeadlessEnvironment &env;
-	ShapeRegistry shapes;
-	BlockTypeRegistry block_types;
+	WorldResources res;
 	World world;
 	Generator generator;
 	ChunkLoader chunk_loader;
-	Skeletons skeletons;
 	Spawner spawner;
 	Server server;
 	IntervalTimer loop_timer;