3 files changed, 87 insertions, 24 deletions

diff --git a/source/Chunk.cpp b/source/Chunk.cpp
index 83d6f14e1..9121dd112 100644
--- a/source/Chunk.cpp
+++ b/source/Chunk.cpp
@@ -966,6 +966,44 @@ 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)
+{
+	// Is it in this chunk?	
+	if ((a_RelX >= 0) && (a_RelX < cChunkDef::Width) && (a_RelZ >= 0) && (a_RelZ < cChunkDef::Width))
+	{
+		QueueTickBlock(a_RelX, a_RelY, a_RelZ);
+		return;
+	}
+
+	// Not in this chunk, try walking the neighbors first:
+	if ((a_RelX < 0) && (m_NeighborXM != NULL))
+	{
+		m_NeighborXM->UnboundedQueueTickBlock(a_RelX + cChunkDef::Width, a_RelY, a_RelZ);
+		return;
+	}
+	if ((a_RelX >= cChunkDef::Width) && (m_NeighborXP != NULL))
+	{
+		m_NeighborXP->UnboundedQueueTickBlock(a_RelX - cChunkDef::Width, a_RelY, a_RelZ);
+		return;
+	}
+	if ((a_RelZ < 0) && (m_NeighborZM != NULL))
+	{
+		m_NeighborZM->UnboundedQueueTickBlock(a_RelX, a_RelY, a_RelZ + cChunkDef::Width);
+		return;
+	}
+	if ((a_RelZ >= cChunkDef::Width) && (m_NeighborZP != NULL))
+	{
+		m_NeighborZP->UnboundedQueueTickBlock(a_RelX, a_RelY, a_RelZ - cChunkDef::Width);
+		return;
+	}
+
+	// Neighbors not available, ignore altogether
+}
+
+
+
+
+
 int cChunk::GetHeight( int a_X, int a_Z )
 {
 	ASSERT((a_X >= 0) && (a_X < Width) && (a_Z >= 0) && (a_Z < Width));
@@ -1139,12 +1177,15 @@ void cChunk::SetBlock( int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType
 	MarkDirty();
 	
 	// The client doesn't need to distinguish between stationary and nonstationary fluids:
-	if (!(
-		((OldBlockType == E_BLOCK_STATIONARY_WATER) && (a_BlockType == E_BLOCK_WATER)) ||             // Replacing stationary water with water
-		((OldBlockType == E_BLOCK_WATER)            && (a_BlockType == E_BLOCK_STATIONARY_WATER)) ||  // Replacing water with stationary water
-		((OldBlockType == E_BLOCK_STATIONARY_LAVA)  && (a_BlockType == E_BLOCK_LAVA)) ||              // Replacing stationary water with water
-		((OldBlockType == E_BLOCK_LAVA)             && (a_BlockType == E_BLOCK_STATIONARY_LAVA))      // Replacing water with stationary water
-	))
+	if (
+		(OldBlockMeta != a_BlockMeta) ||  // Different meta always gets updated
+		!(
+			((OldBlockType == E_BLOCK_STATIONARY_WATER) && (a_BlockType == E_BLOCK_WATER)) ||             // Replacing stationary water with water
+			((OldBlockType == E_BLOCK_WATER)            && (a_BlockType == E_BLOCK_STATIONARY_WATER)) ||  // Replacing water with stationary water
+			((OldBlockType == E_BLOCK_STATIONARY_LAVA)  && (a_BlockType == E_BLOCK_LAVA)) ||              // Replacing stationary water with water
+			((OldBlockType == E_BLOCK_LAVA)             && (a_BlockType == E_BLOCK_STATIONARY_LAVA))      // Replacing water with stationary water
+		)
+	)
 	{
 		cCSLock Lock(m_CSBlockLists);
 		m_PendingSendBlocks.push_back(sSetBlock(m_PosX, m_PosZ, a_RelX, a_RelY, a_RelZ, a_BlockType, a_BlockMeta));
@@ -1263,11 +1304,7 @@ void cChunk::QueueTickBlockNeighbors(int a_RelX, int a_RelY, int a_RelZ)
 	} ;
 	for (int i = 0; i < ARRAYCOUNT(Coords); i++)
 	{
-		cChunk * ch = GetRelNeighborChunk(a_RelX + Coords[i].x, a_RelZ + Coords[i].z);
-		if (ch != NULL)
-		{
-			ch->QueueTickBlock(a_RelX + Coords[i].x, a_RelY + Coords[i].y, a_RelZ + Coords[i].z);
-		}
+		UnboundedQueueTickBlock(a_RelX + Coords[i].x, a_RelY + Coords[i].y, a_RelZ + Coords[i].z);
 	}  // for i - Coords[]
 }
 
@@ -1294,12 +1331,15 @@ void cChunk::FastSetBlock(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockT
 	m_BlockTypes[index] = a_BlockType;
 
 	// The client doesn't need to distinguish between stationary and nonstationary fluids:
-	if (!(
-		((OldBlockType == E_BLOCK_STATIONARY_WATER) && (a_BlockType == E_BLOCK_WATER)) ||             // Replacing stationary water with water
-		((OldBlockType == E_BLOCK_WATER)            && (a_BlockType == E_BLOCK_STATIONARY_WATER)) ||  // Replacing water with stationary water
-		((OldBlockType == E_BLOCK_STATIONARY_LAVA)  && (a_BlockType == E_BLOCK_LAVA)) ||              // Replacing stationary water with water
-		((OldBlockType == E_BLOCK_LAVA)             && (a_BlockType == E_BLOCK_STATIONARY_LAVA))      // Replacing water with stationary water
-	))
+	if (
+		(OldBlockMeta == a_BlockMeta) ||  // Different meta always gets sent to the client
+		!(
+			((OldBlockType == E_BLOCK_STATIONARY_WATER) && (a_BlockType == E_BLOCK_WATER)) ||             // Replacing stationary water with water
+			((OldBlockType == E_BLOCK_WATER)            && (a_BlockType == E_BLOCK_STATIONARY_WATER)) ||  // Replacing water with stationary water
+			((OldBlockType == E_BLOCK_STATIONARY_LAVA)  && (a_BlockType == E_BLOCK_LAVA)) ||              // Replacing stationary water with water
+			((OldBlockType == E_BLOCK_LAVA)             && (a_BlockType == E_BLOCK_STATIONARY_LAVA))      // Replacing water with stationary water
+		)
+	)
 	{
 		cCSLock Lock(m_CSBlockLists);
 		m_PendingSendBlocks.push_back(sSetBlock(m_PosX, m_PosZ, a_RelX, a_RelY, a_RelZ, a_BlockType, a_BlockMeta));
diff --git a/source/Chunk.h b/source/Chunk.h
index 5e679ed12..d7b7fbba6 100644
--- a/source/Chunk.h
+++ b/source/Chunk.h
@@ -270,6 +270,9 @@ public:
 
 	/// Same as FastSetBlock(), but relative coords needn't be in this chunk (uses m_Neighbor-s or m_ChunkMap in such a case); returns true on success; only usable in Tick()
 	bool UnboundedRelFastSetBlock(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta);
+	
+	/// Same as QueueTickBlock(), but relative coords needn't be in this chunk (uses m_Neighbor-s in such a case), ignores unsuccessful attempts
+	void UnboundedQueueTickBlock(int a_RelX, int a_RelY, int a_RelZ);
 
 	// Simulator data:
 	cFireSimulatorChunkData & GetFireSimulatorData (void) { return m_FireSimulatorData; }
diff --git a/source/Simulator/FloodyFluidSimulator.cpp b/source/Simulator/FloodyFluidSimulator.cpp
index 33c8ca5a2..f2cc068e8 100644
--- a/source/Simulator/FloodyFluidSimulator.cpp
+++ b/source/Simulator/FloodyFluidSimulator.cpp
@@ -47,10 +47,17 @@ cFloodyFluidSimulator::cFloodyFluidSimulator(
 

 void cFloodyFluidSimulator::SimulateBlock(cChunk * a_Chunk, int a_RelX, int a_RelY, int a_RelZ)

 {

+	FLOG("Simulating block {%d, %d, %d}: block %d, meta %d", 

+		a_Chunk->GetPosX() * cChunkDef::Width + a_RelX, a_RelY, a_Chunk->GetPosZ() * cChunkDef::Width + a_RelZ,

+		a_Chunk->GetBlock(a_RelX, a_RelY, a_RelZ),

+		a_Chunk->GetMeta(a_RelX, a_RelY, a_RelZ)

+	);

+	

 	NIBBLETYPE MyMeta = a_Chunk->GetMeta(a_RelX, a_RelY, a_RelZ);

 	if (!IsAnyFluidBlock(a_Chunk->GetBlock(a_RelX, a_RelY, a_RelZ)))

 	{

 		// Can happen - if a block is scheduled for simulating and gets replaced in the meantime.

+		FLOG("  BadBlockType exit");

 		return;

 	}

 

@@ -61,6 +68,7 @@ void cFloodyFluidSimulator::SimulateBlock(cChunk * a_Chunk, int a_RelX, int a_Re
 		{

 			// Has no tributary, has been decreased (in CheckTributaries()),

 			// no more processing needed (neighbors have been scheduled by the decrease)

+			FLOG("  CheckTributaries exit");

 			return;

 		}

 	}

@@ -118,6 +126,7 @@ bool cFloodyFluidSimulator::CheckTributaries(cChunk * a_Chunk, int a_RelX, int a
 		if (IsAnyFluidBlock(a_Chunk->GetBlock(a_RelX, a_RelY + 1, a_RelZ)))

 		{

 			// This block is fed from above, no more processing needed

+			FLOG("  Fed from above");

 			return false;

 		}

 	}

@@ -143,6 +152,12 @@ bool cFloodyFluidSimulator::CheckTributaries(cChunk * a_Chunk, int a_RelX, int a
 			if (IsAllowedBlock(BlockType) && IsHigherMeta(BlockMeta, a_MyMeta))

 			{

 				// This block is fed, no more processing needed

+				FLOG("  Fed from {%d, %d, %d}, type %d, meta %d",

+					a_Chunk->GetPosX() * cChunkDef::Width + a_RelX + Coords[i].x,

+					a_RelY,

+					a_Chunk->GetPosZ() * cChunkDef::Width + a_RelZ + Coords[i].z,

+					BlockType, BlockMeta

+				);

 				return false;

 			}

 		}  // for i - Coords[]

@@ -204,7 +219,7 @@ void cFloodyFluidSimulator::SpreadToNeighbor(cChunk * a_NearChunk, int a_RelX, i
 		{

 			// Lava flowing into water, change to stone / cobblestone based on direction:

 			BLOCKTYPE NewBlock = (a_NewMeta == 8) ? E_BLOCK_STONE : E_BLOCK_COBBLESTONE;

-			FLOG("  Lava flowing into water, turning water at {%d, %d, %d} into stone", 

+			FLOG("  Lava flowing into water, turning water at rel {%d, %d, %d} into stone", 

 				a_RelX, a_RelY, a_RelZ,

 				ItemTypeToString(NewBlock).c_str()

 			);

@@ -221,7 +236,7 @@ void cFloodyFluidSimulator::SpreadToNeighbor(cChunk * a_NearChunk, int a_RelX, i
 		{

 			// Water flowing into lava, change to cobblestone / obsidian based on dest block:

 			BLOCKTYPE NewBlock = (BlockMeta == 0) ? E_BLOCK_OBSIDIAN : E_BLOCK_COBBLESTONE;

-			FLOG("  Water flowing into lava, turning lava at {%d, %d, %d} into %s", 

+			FLOG("  Water flowing into lava, turning lava at rel {%d, %d, %d} into %s", 

 				a_RelX, a_RelY, a_RelZ, ItemTypeToString(NewBlock).c_str()

 			);

 			a_NearChunk->UnboundedRelSetBlock(a_RelX, a_RelY, a_RelZ, NewBlock, 0);

@@ -258,7 +273,12 @@ void cFloodyFluidSimulator::SpreadToNeighbor(cChunk * a_NearChunk, int a_RelX, i
 	}  // if (CanWashAway)

 	

 	// Spread:

-	FLOG("  Spreading to {%d, %d, %d} with meta %d", a_RelX, a_RelY, a_RelZ, a_NewMeta);

+	FLOG("  Spreading to {%d, %d, %d} with meta %d", 

+		a_NearChunk->GetPosX() * cChunkDef::Width + a_RelX,

+		a_RelY,

+		a_NearChunk->GetPosZ() * cChunkDef::Width + a_RelZ,

+		a_NewMeta

+	);

 	a_NearChunk->UnboundedRelSetBlock(a_RelX, a_RelY, a_RelZ, m_FluidBlock, a_NewMeta);

 }

 

@@ -291,21 +311,21 @@ bool cFloodyFluidSimulator::CheckNeighborsForSource(cChunk * a_Chunk, int a_RelX
 			// Neighbor not available, skip it

 			continue;

 		}

-		FLOG("   Neighbor at {%d, %d, %d}: %s", x, y, z, ItemToFullString(cItem(BlockType, 1, BlockMeta)).c_str());

+		// FLOG("   Neighbor at {%d, %d, %d}: %s", x, y, z, ItemToFullString(cItem(BlockType, 1, BlockMeta)).c_str());

 		if ((BlockMeta == 0) && IsAnyFluidBlock(BlockType))

 		{

 			NumNeeded--;

-			FLOG("    Found a neighbor source at {%d, %d, %d}, NumNeeded := %d", x, y, z, NumNeeded);

+			// FLOG("    Found a neighbor source at {%d, %d, %d}, NumNeeded := %d", x, y, z, NumNeeded);

 			if (NumNeeded == 0)

 			{

 				// Found enough, turn into a source and bail out

-				FLOG("    Found enough neighbor sources, turning into a source");

+				// FLOG("    Found enough neighbor sources, turning into a source");

 				a_Chunk->SetBlock(a_RelX, a_RelY, a_RelZ, m_FluidBlock, 0);

 				return true;

 			}

 		}

 	}

-	FLOG("    Not enough neighbors for turning into a source, NumNeeded = %d", NumNeeded);

+	// FLOG("    Not enough neighbors for turning into a source, NumNeeded = %d", NumNeeded);

 	return false;

 }