From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Tue, 27 Oct 2015 16:46:16 +0000 (+0100)
Subject: don't send chunks and entities simultaneously while skipping
X-Git-Url: https://git.localhorst.tv/?a=commitdiff_plain;h=c58e8bce2b5eb61dea7bd78e98da8e1dcceb2d29;hp=b9462143d9b2fd1f54aa3b4ec32eecb62c01615f;p=blank.git

don't send chunks and entities simultaneously while skipping
---

diff --git a/src/server/net.cpp b/src/server/net.cpp
index cd4f200..aa1bdeb 100644
--- a/src/server/net.cpp
+++ b/src/server/net.cpp
@@ -398,6 +398,11 @@ void ClientConnection::CheckChunkQueue() {
 		old_base = PlayerChunks().Base();
 		sort(chunk_queue.begin(), chunk_queue.end(), QueueCompare(old_base));
 	}
+	// if we have packet skip enabled and just pushed an entity
+	// update, don't also send chunk data
+	if (NetStat().SuggestedPacketSkip() > 0 && entity_updates_skipped == 0) {
+		return;
+	}
 	if (transmitter.Transmitting()) {
 		transmitter.Transmit();
 		return;