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 6cf3aa70f1
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Simulator/FloodyFluidSimulator.cpp
View File

@ -58,6 +58,7 @@ void cFloodyFluidSimulator::SimulateBlock(cChunk * a_Chunk, int a_RelX, int a_Re
BLOCKTYPE MyBlock; NIBBLETYPE MyMeta; BLOCKTYPE MyBlock; NIBBLETYPE MyMeta;
a_Chunk->GetBlockTypeMeta(a_RelX, a_RelY, a_RelZ, MyBlock, MyMeta); a_Chunk->GetBlockTypeMeta(a_RelX, a_RelY, a_RelZ, MyBlock, MyMeta);
if (!IsAnyFluidBlock(MyBlock)) if (!IsAnyFluidBlock(MyBlock))
{ {
// Can happen - if a block is scheduled for simulating and gets replaced in the meantime. // Can happen - if a block is scheduled for simulating and gets replaced in the meantime.
@ -115,13 +116,15 @@ 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)) else if (SpreadFurther && (NewMeta < 8))
{ {
// Spread to the neighbors: // Spread to the neighbors:
SpreadXZ(a_Chunk, a_RelX, a_RelY, a_RelZ, NewMeta); 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);