From b73fba7c0825577fa3b8ba2c54d01d0c03e028fd Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Mon, 7 May 2012 18:52:40 +0000 Subject: [PATCH] Updated version text to include 1.2.5; ChunkSender doesn't serialize chunk packets for chunks without a client git-svn-id: http://mc-server.googlecode.com/svn/trunk@480 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/ChunkSender.cpp | 5 +++++ source/cClientHandle.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/source/ChunkSender.cpp b/source/ChunkSender.cpp index 517150d1d..232ce423c 100644 --- a/source/ChunkSender.cpp +++ b/source/ChunkSender.cpp @@ -182,6 +182,11 @@ void cChunkSender::SendChunk(int a_ChunkX, int a_ChunkY, int a_ChunkZ, cClientHa } } + if (!m_World->HasChunkAnyClients(a_ChunkX, a_ChunkY, a_ChunkZ)) + { + return; + } + // Prepare MapChunk packets: if( !m_World->GetChunkData(a_ChunkX, a_ChunkY, a_ChunkZ, *this) ) { diff --git a/source/cClientHandle.h b/source/cClientHandle.h index dd5094222..96b3ae08a 100644 --- a/source/cClientHandle.h +++ b/source/cClientHandle.h @@ -45,7 +45,7 @@ #define MCS_PROTOCOL_VERSION 29 // Synchronize this with MCS_CLIENT_VERSION below! -#define MCS_CLIENT_VERSION "1.2.4" +#define MCS_CLIENT_VERSION "1.2.4, 1.2.5"