summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbibo38 <bibo38@github.com>2015-07-15 22:14:05 +0200
committerbibo38 <bibo38@github.com>2015-07-15 23:36:51 +0200
commit3c9e113985f3e218426d6396e20eab09811c888c (patch)
tree889166482d51c83598f5dc20afc41073578f7777 /src
parentMerge pull request #2330 from cuberite/libraryupdate (diff)
downloadcuberite-3c9e113985f3e218426d6396e20eab09811c888c.tar
cuberite-3c9e113985f3e218426d6396e20eab09811c888c.tar.gz
cuberite-3c9e113985f3e218426d6396e20eab09811c888c.tar.bz2
cuberite-3c9e113985f3e218426d6396e20eab09811c888c.tar.lz
cuberite-3c9e113985f3e218426d6396e20eab09811c888c.tar.xz
cuberite-3c9e113985f3e218426d6396e20eab09811c888c.tar.zst
cuberite-3c9e113985f3e218426d6396e20eab09811c888c.zip
Diffstat (limited to 'src')
-rw-r--r--src/Simulator/FloodyFluidSimulator.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Simulator/FloodyFluidSimulator.cpp b/src/Simulator/FloodyFluidSimulator.cpp
index 69c46f090..1e56f9528 100644
--- a/src/Simulator/FloodyFluidSimulator.cpp
+++ b/src/Simulator/FloodyFluidSimulator.cpp
@@ -111,9 +111,12 @@ void cFloodyFluidSimulator::SimulateBlock(cChunk * a_Chunk, int a_RelX, int a_Re
// If source creation is on, check for it here:
if (
- (m_NumNeighborsForSource > 0) && // Source creation is on
- (MyMeta == m_Falloff) && // Only exactly one block away from a source (fast bail-out)
- !IsPassableForFluid(Below) && // Only exactly 1 block deep
+ (m_NumNeighborsForSource > 0) && // Source creation is on
+ (MyMeta == m_Falloff) && // Only exactly one block away from a source (fast bail-out)
+ (
+ !IsPassableForFluid(Below) || // Only exactly 1 block deep
+ (Below == m_StationaryFluidBlock) // Or a source block underneath
+ ) &&
CheckNeighborsForSource(a_Chunk, a_RelX, a_RelY, a_RelZ) // Did we create a source?
)
{