diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-03-08 16:13:45 +0100 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-03-08 16:13:45 +0100 |
| commit | c3758112cc25b3f491abeb88c3f1d10b8985362a (patch) | |
| tree | d22a0004d00a303d7c063f105929b21735a2ef3b /src/Simulator/VanillaFluidSimulator.cpp | |
| parent | Warnings (diff) | |
| parent | Merge pull request #770 from xdot/master (diff) | |
| download | cuberite-c3758112cc25b3f491abeb88c3f1d10b8985362a.tar cuberite-c3758112cc25b3f491abeb88c3f1d10b8985362a.tar.gz cuberite-c3758112cc25b3f491abeb88c3f1d10b8985362a.tar.bz2 cuberite-c3758112cc25b3f491abeb88c3f1d10b8985362a.tar.lz cuberite-c3758112cc25b3f491abeb88c3f1d10b8985362a.tar.xz cuberite-c3758112cc25b3f491abeb88c3f1d10b8985362a.tar.zst cuberite-c3758112cc25b3f491abeb88c3f1d10b8985362a.zip | |
Diffstat (limited to 'src/Simulator/VanillaFluidSimulator.cpp')
| -rw-r--r-- | src/Simulator/VanillaFluidSimulator.cpp | 4 |
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; |