summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJulian Laubstein <julianlaubstein@yahoo.de>2015-07-16 23:07:24 +0200
committerJulian Laubstein <julianlaubstein@yahoo.de>2015-07-16 23:07:24 +0200
commit29d1f372588d0b8f517093dbde33f66b7db0ea37 (patch)
tree282ac7e200302240b20df90e75264d9b3790e4b3 /src
parentMerge pull request #2348 from bibo38/customname (diff)
parentNow Water sources will also be created on top of existing water sources. (diff)
downloadcuberite-29d1f372588d0b8f517093dbde33f66b7db0ea37.tar
cuberite-29d1f372588d0b8f517093dbde33f66b7db0ea37.tar.gz
cuberite-29d1f372588d0b8f517093dbde33f66b7db0ea37.tar.bz2
cuberite-29d1f372588d0b8f517093dbde33f66b7db0ea37.tar.lz
cuberite-29d1f372588d0b8f517093dbde33f66b7db0ea37.tar.xz
cuberite-29d1f372588d0b8f517093dbde33f66b7db0ea37.tar.zst
cuberite-29d1f372588d0b8f517093dbde33f66b7db0ea37.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?
)
{