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

diff --git a/src/server/ServerState.hpp b/src/server/ServerState.hpp
index 31ad521..fbf28e5 100644
--- a/src/server/ServerState.hpp
+++ b/src/server/ServerState.hpp
@@ -5,8 +5,7 @@
 #include "../ai/Spawner.hpp"
 #include "../app/IntervalTimer.hpp"
 #include "../app/State.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"
@@ -31,6 +30,7 @@ public:
 		const WorldSave &,
 		const Config &
 	);
+	~ServerState();
 
 	void Handle(const SDL_Event &) override;
 	void Update(int dt) override;
@@ -38,11 +38,10 @@ public:
 
 private:
 	HeadlessEnvironment &env;
-	BlockTypeRegistry block_types;
+	WorldResources res;
 	World world;
 	Generator generator;
 	ChunkLoader chunk_loader;
-	Skeletons skeletons;
 	Spawner spawner;
 	Server server;
 	IntervalTimer loop_timer;