From ede88aa6cd259d649a84ca530e2d624a9e80047b Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Thu, 18 Apr 2019 22:53:44 +0100
Subject: [PATCH] Fix multi-packet network content requests (ContentVector)

Broken by incorrect merge conflict resolution in ba34ec7ad

See #86
---
 src/network/network_content.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/network/network_content.cpp b/src/network/network_content.cpp
index 2d9bdf1a0d..2a4fdd761e 100644
--- a/src/network/network_content.cpp
+++ b/src/network/network_content.cpp
@@ -255,7 +255,8 @@ void ClientNetworkContentSocketHandler::RequestContentList(ContentVector *cv, bo
 		const uint to_send = min<uint>(cv->size() - offset, max_per_packet);
 		p->Send_uint8(to_send);
 
-		for (const ContentInfo *ci : *cv) {
+		for (uint i = 0; i < to_send; i++) {
+			const ContentInfo *ci = (*cv)[offset + i];
 			p->Send_uint8((byte)ci->type);
 			p->Send_uint32(ci->unique_id);
 			if (!send_md5sum) continue;