X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2FServer.hpp;fp=src%2Fserver%2FServer.hpp;h=c12b86aa75ba0b4d9e17e726aab2c54c44474491;hb=d91257ba2a51416683be3f54fe16cb2e96ae29f5;hp=372a947ef65fe0e14c1aa209d091036fcd47ed6b;hpb=c3397eb26a844ded6ddbf92c95cbb87cd3baf65d;p=blank.git

diff --git a/src/server/Server.hpp b/src/server/Server.hpp
index 372a947..c12b86a 100644
--- a/src/server/Server.hpp
+++ b/src/server/Server.hpp
@@ -2,6 +2,7 @@
 #define BLANK_SERVER_SERVER_HPP
 
 #include "../app/Config.hpp"
+#include "../world/World.hpp"
 #include "../world/WorldManipulator.hpp"
 
 #include <list>
@@ -10,8 +11,9 @@
 
 namespace blank {
 
+class ChunkIndex;
 class CompositeModel;
-class World;
+class Player;
 class WorldSave;
 
 namespace server {
@@ -22,7 +24,7 @@ class Server
 : public WorldManipulator {
 
 public:
-	Server(const Config::Network &, World &, const WorldSave &);
+	Server(const Config::Network &, World &, const World::Config &, const WorldSave &);
 	~Server();
 
 	void Handle();
@@ -39,6 +41,8 @@ public:
 	bool HasPlayerModel() const noexcept;
 	const CompositeModel &GetPlayerModel() const noexcept;
 
+	Player *JoinPlayer(const std::string &name);
+
 	void SetBlock(Chunk &, int, const Block &) override;
 
 private:
@@ -52,6 +56,7 @@ private:
 	std::list<ClientConnection> clients;
 
 	World &world;
+	ChunkIndex &spawn_index;
 	const WorldSave &save;
 	const CompositeModel *player_model;