diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-03-08 16:14:22 +0100 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-03-08 16:14:22 +0100 |
| commit | c4c58c71fb0d38c2b13752810db0f52ba07c0af0 (patch) | |
| tree | 0cc1bb8bd0fa5655bd86c6befaa71fec885da665 /src/Simulator/VanillaFluidSimulator.cpp | |
| parent | Turned on Werror (diff) | |
| parent | Merge branch 'master' into warnings (diff) | |
| download | cuberite-c4c58c71fb0d38c2b13752810db0f52ba07c0af0.tar cuberite-c4c58c71fb0d38c2b13752810db0f52ba07c0af0.tar.gz cuberite-c4c58c71fb0d38c2b13752810db0f52ba07c0af0.tar.bz2 cuberite-c4c58c71fb0d38c2b13752810db0f52ba07c0af0.tar.lz cuberite-c4c58c71fb0d38c2b13752810db0f52ba07c0af0.tar.xz cuberite-c4c58c71fb0d38c2b13752810db0f52ba07c0af0.tar.zst cuberite-c4c58c71fb0d38c2b13752810db0f52ba07c0af0.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; |