flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed water from spreading on bottom of world

Browse Source
This commit is contained in:
gushromp 2014-12-16 22:38:57 +01:00
parent aff32ba27b
commit fd325e3990
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Simulator/FloodyFluidSimulator.cpp
View File

@ -83,7 +83,7 @@ void cFloodyFluidSimulator::SimulateBlock(cChunk * a_Chunk, int a_RelX, int a_Re
return; return;
} }
} }
// New meta for the spreading to neighbors: // New meta for the spreading to neighbors:
// If this is a source block or was falling, the new meta is just the falloff // If this is a source block or was falling, the new meta is just the falloff
// Otherwise it is the current meta plus falloff (may be larger than max height, will be checked later) // Otherwise it is the current meta plus falloff (may be larger than max height, will be checked later)
@ -103,6 +103,11 @@ void cFloodyFluidSimulator::SimulateBlock(cChunk * a_Chunk, int a_RelX, int a_Re
SpreadFurther = false; SpreadFurther = false;
} }
} }
// Spread to the neighbors:
if (SpreadFurther && (NewMeta < 8))
{
SpreadXZ(a_Chunk, a_RelX, a_RelY, a_RelZ, NewMeta);
}
// If source creation is on, check for it here: // If source creation is on, check for it here:
else if ( else if (
(m_NumNeighborsForSource > 0) && // Source creation is on (m_NumNeighborsForSource > 0) && // Source creation is on
@ -115,14 +120,13 @@ void cFloodyFluidSimulator::SimulateBlock(cChunk * a_Chunk, int a_RelX, int a_Re
// Also has been re-scheduled for ticking in the next wave, so no marking is needed // Also has been re-scheduled for ticking in the next wave, so no marking is needed
return; return;
} }
} }
if (SpreadFurther && (NewMeta < 8))
{
// Spread to the neighbors:
SpreadXZ(a_Chunk, a_RelX, a_RelY, a_RelZ, NewMeta);
}
// Mark as processed: // Mark as processed:
a_Chunk->FastSetBlock(a_RelX, a_RelY, a_RelZ, m_StationaryFluidBlock, MyMeta); a_Chunk->FastSetBlock(a_RelX, a_RelY, a_RelZ, m_StationaryFluidBlock, MyMeta);
} }