X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2Fnet.cpp;h=aa1bdeb89448c46c757f6a4f47eb283c730ce581;hb=8e9e2bb4b2dd5a4100f4531628ab58002fe253c1;hp=cd4f2003c359b1896adbf435430eae8b68fd3562;hpb=b9462143d9b2fd1f54aa3b4ec32eecb62c01615f;p=blank.git

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;