X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2Fnet.cpp;h=d16088991f22f2a840869dc1c9da89c040764cbe;hb=fa73e3600dee78063ab95e1903172ab339dcd4bd;hp=47342ffad130b0a2edc6337797fa458eee9863ec;hpb=56069d41c1553d87a8759713ef391d3a908adc0e;p=blank.git

diff --git a/src/server/net.cpp b/src/server/net.cpp
index 47342ff..d160889 100644
--- a/src/server/net.cpp
+++ b/src/server/net.cpp
@@ -401,6 +401,7 @@ void ClientConnection::CheckChunkQueue() {
 		}
 		old_base = PlayerChunks().Base();
 		sort(chunk_queue.begin(), chunk_queue.end(), QueueCompare(old_base));
+		chunk_queue.erase(unique(chunk_queue.begin(), chunk_queue.end()), chunk_queue.end());
 	}
 	// don't push entity updates and chunk data in the same tick
 	if (chunk_blocks_skipped >= NetStat().SuggestedPacketHold() && !SendingUpdates()) {
@@ -612,6 +613,14 @@ bool ClientConnection::ChunkInRange(const glm::ivec3 &pos) const noexcept {
 	return HasPlayer() && PlayerChunks().InRange(pos);
 }
 
+void ClientConnection::On(const Packet::ChunkBegin &pack) {
+	glm::ivec3 pos;
+	pack.ReadChunkCoords(pos);
+	if (ChunkInRange(pos)) {
+		chunk_queue.push_front(pos);
+	}
+}
+
 void ClientConnection::On(const Packet::Message &pack) {
 	uint8_t type;
 	uint32_t ref;
@@ -633,27 +642,53 @@ Server::Server(
 	const WorldSave &save)
 : serv_sock(nullptr)
 , serv_pack{ -1, nullptr, 0 }
+, serv_set(SDLNet_AllocSocketSet(1))
 , clients()
 , world(world)
 , spawn_index(world.Chunks().MakeIndex(wc.spawn, 3))
 , save(save)
 , player_model(nullptr)
 , cli(world) {
+	if (!serv_set) {
+		throw NetError("SDLNet_AllocSocketSet");
+	}
+
 	serv_sock = SDLNet_UDP_Open(conf.port);
 	if (!serv_sock) {
+		SDLNet_FreeSocketSet(serv_set);
 		throw NetError("SDLNet_UDP_Open");
 	}
 
+	if (SDLNet_UDP_AddSocket(serv_set, serv_sock) == -1) {
+		SDLNet_UDP_Close(serv_sock);
+		SDLNet_FreeSocketSet(serv_set);
+		throw NetError("SDLNet_UDP_AddSocket");
+	}
+
 	serv_pack.data = new Uint8[sizeof(Packet)];
 	serv_pack.maxlen = sizeof(Packet);
 }
 
 Server::~Server() {
+	for (ClientConnection &client : clients) {
+		client.Disconnected();
+	}
+	clients.clear();
 	world.Chunks().UnregisterIndex(spawn_index);
 	delete[] serv_pack.data;
+	SDLNet_UDP_DelSocket(serv_set, serv_sock);
 	SDLNet_UDP_Close(serv_sock);
+	SDLNet_FreeSocketSet(serv_set);
+}
+
+
+void Server::Wait(int dt) noexcept {
+	SDLNet_CheckSockets(serv_set, dt);
 }
 
+bool Server::Ready() noexcept {
+	return SDLNet_CheckSockets(serv_set, 0) > 0;
+}
 
 void Server::Handle() {
 	int result = SDLNet_UDP_Recv(serv_sock, &serv_pack);