summaryrefslogtreecommitdiffstats
path: root/src/Simulator/VanillaFluidSimulator.cpp
diff options
context:
space:
mode:
authorandrew <xdotftw@gmail.com>2014-03-07 14:42:03 +0100
committerandrew <xdotftw@gmail.com>2014-03-07 14:42:03 +0100
commit880852394275c4cc3c458582fc245f6f22f9d200 (patch)
tree4ee4914e98b277f06dbbc336690569a09e0be517 /src/Simulator/VanillaFluidSimulator.cpp
parentRewound PolarSSL to master branch. (diff)
downloadcuberite-880852394275c4cc3c458582fc245f6f22f9d200.tar
cuberite-880852394275c4cc3c458582fc245f6f22f9d200.tar.gz
cuberite-880852394275c4cc3c458582fc245f6f22f9d200.tar.bz2
cuberite-880852394275c4cc3c458582fc245f6f22f9d200.tar.lz
cuberite-880852394275c4cc3c458582fc245f6f22f9d200.tar.xz
cuberite-880852394275c4cc3c458582fc245f6f22f9d200.tar.zst
cuberite-880852394275c4cc3c458582fc245f6f22f9d200.zip
Diffstat (limited to 'src/Simulator/VanillaFluidSimulator.cpp')
-rw-r--r--src/Simulator/VanillaFluidSimulator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Simulator/VanillaFluidSimulator.cpp b/src/Simulator/VanillaFluidSimulator.cpp
index 5308d162b..78aff9d68 100644
--- a/src/Simulator/VanillaFluidSimulator.cpp
+++ b/src/Simulator/VanillaFluidSimulator.cpp
@@ -86,7 +86,7 @@ int cVanillaFluidSimulator::CalculateFlowCost(cChunk * a_Chunk, int a_RelX, int
{
return Cost;
}
- if (!IsPassableForFluid(BlockType))
+ if (!IsPassableForFluid(BlockType) && !IsBlockLiquid(BlockType))
{
return Cost;
}
@@ -96,7 +96,7 @@ int cVanillaFluidSimulator::CalculateFlowCost(cChunk * a_Chunk, int a_RelX, int
{
return Cost;
}
- if (IsPassableForFluid(BlockType))
+ if (IsPassableForFluid(BlockType) || IsBlockLiquid(BlockType))
{
// Path found, exit
return a_Iteration;