don't send chunks and entities simultaneously while skipping

diff --git a/src/server/net.cpp b/src/server/net.cpp
index cd4f2003c359b1896adbf435430eae8b68fd3562..aa1bdeb89448c46c757f6a4f47eb283c730ce581 100644 (file)
--- 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;