2 files changed, 16 insertions, 1 deletions

diff --git a/source/Blocks/BlockHandler.cpp b/source/Blocks/BlockHandler.cpp
index 4b7aa6fa2..816c6f7e6 100644
--- a/source/Blocks/BlockHandler.cpp
+++ b/source/Blocks/BlockHandler.cpp
@@ -288,7 +288,10 @@ void cBlockHandler::OnDestroyed(cWorld *a_World, int a_BlockX, int a_BlockY, int
 

 void cBlockHandler::NeighborChanged(cWorld *a_World, int a_BlockX, int a_BlockY, int a_BlockZ)

 {

-	GetBlockHandler(a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ))->OnNeighborChanged(a_World, a_BlockX, a_BlockY, a_BlockZ);

+	if ((a_BlockY >= 0) && (a_BlockY < cChunkDef::Height))

+	{

+		GetBlockHandler(a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ))->OnNeighborChanged(a_World, a_BlockX, a_BlockY, a_BlockZ);

+	}

 }

 

 

diff --git a/source/Chunk.cpp b/source/Chunk.cpp
index 802cb358c..83a07d56d 100644
--- a/source/Chunk.cpp
+++ b/source/Chunk.cpp
@@ -1043,6 +1043,12 @@ bool cChunk::UnboundedRelFastSetBlock(int a_RelX, int a_RelY, int a_RelZ, BLOCKT
 
 void cChunk::UnboundedQueueTickBlock(int a_RelX, int a_RelY, int a_RelZ)
 {
+	if ((a_RelY < 0) || (a_RelY >= cChunkDef::Height))
+	{
+		// Outside of chunkmap
+		return;
+	}
+	
 	// Is it in this chunk?	
 	if ((a_RelX >= 0) && (a_RelX < cChunkDef::Width) && (a_RelZ >= 0) && (a_RelZ < cChunkDef::Width))
 	{
@@ -1350,6 +1356,12 @@ void cChunk::SetBlock( int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType
 
 void cChunk::QueueTickBlock(int a_RelX, int a_RelY, int a_RelZ)
 {
+	ASSERT (
+		(a_RelX >= 0) && (a_RelX < Width) &&
+		(a_RelY >= 0) && (a_RelY < Height) &&
+		(a_RelZ >= 0) && (a_RelZ < Width)
+	);  // Coords need to be valid
+
 	if (!IsValid())
 	{
 		return;