3 files changed, 134 insertions, 93 deletions

diff --git a/src/ChunkBuffer.cpp b/src/ChunkBuffer.cpp
index baeeff890..96077b966 100644
--- a/src/ChunkBuffer.cpp
+++ b/src/ChunkBuffer.cpp
@@ -295,3 +295,14 @@ void cChunkBuffer::Free(cChunkBuffer::sChunkSection * ptr) const
 
 
 
+void cChunkBuffer::ZeroSection(cChunkBuffer::sChunkSection * ptr) const
+{
+	memset(ptr->m_BlockTypes,0x00,sizeof(ptr->m_BlockTypes));
+	memset(ptr->m_BlockMeta,0x00,sizeof(ptr->m_BlockMeta));
+	memset(ptr->m_BlockLight,0x00,sizeof(ptr->m_BlockLight));
+	memset(ptr->m_BlockSkyLight,0x00,sizeof(ptr->m_BlockSkyLight));
+}
+
+
+
+
diff --git a/src/ChunkBuffer.h b/src/ChunkBuffer.h
index b1bd024d5..e16575bb2 100644
--- a/src/ChunkBuffer.h
+++ b/src/ChunkBuffer.h
@@ -121,12 +121,17 @@ public:
 		int Section = a_RelY / CHUNK_SECTION_HEIGHT;
 		if(!m_Sections[Section])
 		{
+			if(a_Block == 0x00)
+			{
+				return;
+			}
 			m_Sections[Section] = Allocate();
 			if(!m_Sections[Section])
 			{
 				ASSERT(!"Failed to allocate a new section in Chunkbuffer");
 				return;
 			}
+			ZeroSection(m_Sections[Section]);
 		}
 		int Index = cChunkDef::MakeIndexNoCheck(a_RelX, a_RelY - (Section * CHUNK_SECTION_HEIGHT), a_RelZ);
 		m_Sections[Section]->m_BlockTypes[Index] = a_Block;
@@ -166,12 +171,17 @@ public:
 		int Section = a_RelY / CHUNK_SECTION_HEIGHT;
 		if(!m_Sections[Section])
 		{
+			if((a_Nibble & 0xf) == 0x00)
+			{
+				return;
+			}
 			m_Sections[Section] = Allocate();
 			if(!m_Sections[Section])
 			{
 				ASSERT(!"Failed to allocate a new section in Chunkbuffer");
 				return;
 			}
+			ZeroSection(m_Sections[Section]);
 		}
 		int Index = cChunkDef::MakeIndexNoCheck(a_RelX, a_RelY - (Section * CHUNK_SECTION_HEIGHT), a_RelZ);
 		m_Sections[Section]->m_BlockMeta[Index / 2] = static_cast<NIBBLETYPE>(
@@ -247,6 +257,8 @@ private:
 	
 	sChunkSection * Allocate() const;
 	void Free(sChunkSection * ptr) const;
+	
+	void ZeroSection(sChunkSection * ptr) const;
 };
 
 
diff --git a/tests/ChunkBuffer/Coordinates.cpp b/tests/ChunkBuffer/Coordinates.cpp
index a6a8aa18f..b9861df23 100644
--- a/tests/ChunkBuffer/Coordinates.cpp
+++ b/tests/ChunkBuffer/Coordinates.cpp
@@ -6,101 +6,119 @@
 
 int main(int argc, char** argv)
 {
-	cChunkBuffer buffer;
-	
-	// Empty chunks
-	buffer.SetBlock(0,0,0, 0xAB);
-	testassert(buffer.GetBlock(0,0,0) == 0xAB);
-	buffer.SetMeta(0,16,0, 0xC);
-	testassert(buffer.GetMeta(0,16,0) == 0xC);
-	
-	// loaded but not written segments
-	testassert(buffer.GetBlock(1,0,0) == 0x0);
-	testassert(buffer.GetMeta(1,16,0) == 0x0);
-	
-	// Notloaded segments
-	testassert(buffer.GetBlock(0,32,0) == 0x0);
-	testassert(buffer.GetMeta(0,48,0) == 0x0);
-	
-	// Out of Range
-	CheckAsserts(
-		buffer.SetBlock(-1, 0, 0, 0);
-	);
-	CheckAsserts(
-		buffer.SetBlock(0, -1, 0, 0);
-	);
-	CheckAsserts(
-		buffer.SetBlock(0, 0, -1, 0);
-	);
-	CheckAsserts(
-		buffer.SetBlock(256, 0, 0, 0);
-	);
-	CheckAsserts(
-		buffer.SetBlock(0, 256, 0, 0);
-	);
-	CheckAsserts(
-		buffer.SetBlock(0, 0, 256, 0);
-	);
-	
-	// Out of Range
-	CheckAsserts(
-		buffer.GetBlock(-1, 0, 0);
-	);
-	CheckAsserts(
-		buffer.GetBlock(0, -1, 0);
-	);
-	CheckAsserts(
-		buffer.GetBlock(0, 0, -1);
-	);
-	CheckAsserts(
-		buffer.GetBlock(256, 0, 0);
-	);
-	CheckAsserts(
-		buffer.GetBlock(0, 256, 0);
-	);
-	CheckAsserts(
-		buffer.GetBlock(0, 0, 256);
-	);
+	{
+		cChunkBuffer buffer;
+
+		// Empty chunks
+		buffer.SetBlock(0,0,0, 0xAB);
+		testassert(buffer.GetBlock(0,0,0) == 0xAB);
+		buffer.SetMeta(0,16,0, 0xC);
+		testassert(buffer.GetMeta(0,16,0) == 0xC);
+
+		// loaded but not written segments
+		testassert(buffer.GetBlock(1,0,0) == 0x0);
+		testassert(buffer.GetMeta(1,16,0) == 0x0);
+
+		// Notloaded segments
+		testassert(buffer.GetBlock(0,32,0) == 0x0);
+		testassert(buffer.GetMeta(0,48,0) == 0x0);
+
+		// Out of Range
+		CheckAsserts(
+			buffer.SetBlock(-1, 0, 0, 0);
+		);
+		CheckAsserts(
+			buffer.SetBlock(0, -1, 0, 0);
+		);
+		CheckAsserts(
+			buffer.SetBlock(0, 0, -1, 0);
+		);
+		CheckAsserts(
+			buffer.SetBlock(256, 0, 0, 0);
+		);
+		CheckAsserts(
+			buffer.SetBlock(0, 256, 0, 0);
+		);
+		CheckAsserts(
+			buffer.SetBlock(0, 0, 256, 0);
+		);
+
+		// Out of Range
+		CheckAsserts(
+			buffer.GetBlock(-1, 0, 0);
+		);
+		CheckAsserts(
+			buffer.GetBlock(0, -1, 0);
+		);
+		CheckAsserts(
+			buffer.GetBlock(0, 0, -1);
+		);
+		CheckAsserts(
+			buffer.GetBlock(256, 0, 0);
+		);
+		CheckAsserts(
+			buffer.GetBlock(0, 256, 0);
+		);
+		CheckAsserts(
+			buffer.GetBlock(0, 0, 256);
+		);
+
+		// Out of Range
+		CheckAsserts(
+			buffer.SetMeta(-1, 0, 0, 0);
+		);
+		CheckAsserts(
+			buffer.SetMeta(0, -1, 0, 0);
+		);
+		CheckAsserts(
+			buffer.SetMeta(0, 0, -1, 0);
+		);
+		CheckAsserts(
+			buffer.SetMeta(256, 0, 0, 0);
+		);
+		CheckAsserts(
+			buffer.SetMeta(0, 256, 0, 0);
+		);
+		CheckAsserts(
+			buffer.SetMeta(0, 0, 256, 0);
+		);
+
+		// Out of Range
+		CheckAsserts(
+			buffer.GetMeta(-1, 0, 0);
+		);
+		CheckAsserts(
+			buffer.GetMeta(0, -1, 0);
+		);
+		CheckAsserts(
+			buffer.GetMeta(0, 0, -1);
+		);
+		CheckAsserts(
+			buffer.GetMeta(256, 0, 0);
+		);
+		CheckAsserts(
+			buffer.GetMeta(0, 256, 0);
+		);
+		CheckAsserts(
+			buffer.GetMeta(0, 0, 256);
+		);
+	}
 	
-	// Out of Range
-	CheckAsserts(
-		buffer.SetMeta(-1, 0, 0, 0);
-	);
-	CheckAsserts(
-		buffer.SetMeta(0, -1, 0, 0);
-	);
-	CheckAsserts(
-		buffer.SetMeta(0, 0, -1, 0);
-	);
-	CheckAsserts(
-		buffer.SetMeta(256, 0, 0, 0);
-	);
-	CheckAsserts(
-		buffer.SetMeta(0, 256, 0, 0);
-	);
-	CheckAsserts(
-		buffer.SetMeta(0, 0, 256, 0);
-	);
+	{
+		cChunkBuffer buffer;
+		
+		// Zero's
+		buffer.SetBlock(0,0,0, 0x0);
+		buffer.SetBlock(0,0,1, 0xAB);
+		testassert(buffer.GetBlock(0,0,0) == 0x0);
+		testassert(buffer.GetBlock(0,0,1) == 0xAB);
+
+		buffer.SetMeta(0,16,0, 0x0);
+		buffer.SetMeta(0,16,1, 0xC);
+		testassert(buffer.GetMeta(0,16,0) == 0x0);
+		testassert(buffer.GetMeta(0,16,1) == 0xC);
+	}
 	
-	// Out of Range
-	CheckAsserts(
-		buffer.GetMeta(-1, 0, 0);
-	);
-	CheckAsserts(
-		buffer.GetMeta(0, -1, 0);
-	);
-	CheckAsserts(
-		buffer.GetMeta(0, 0, -1);
-	);
-	CheckAsserts(
-		buffer.GetMeta(256, 0, 0);
-	);
-	CheckAsserts(
-		buffer.GetMeta(0, 256, 0);
-	);
-	CheckAsserts(
-		buffer.GetMeta(0, 0, 256);
-	);
 	
 	return 0;
 }