diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-12-06 18:41:48 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-12-06 18:41:48 +0100 |
| commit | 3acdf25b058bceef3005eead6e909c27c7a9e4a8 (patch) | |
| tree | 38c40774061bd44b3452091092a018c53459907b /src/Simulator | |
| parent | Tools: Removed unused Timer.* file from CMakeLists.txt. (diff) | |
| parent | Merge pull request #1647 from mc-server/SocketThreadsFix (diff) | |
| download | cuberite-3acdf25b058bceef3005eead6e909c27c7a9e4a8.tar cuberite-3acdf25b058bceef3005eead6e909c27c7a9e4a8.tar.gz cuberite-3acdf25b058bceef3005eead6e909c27c7a9e4a8.tar.bz2 cuberite-3acdf25b058bceef3005eead6e909c27c7a9e4a8.tar.lz cuberite-3acdf25b058bceef3005eead6e909c27c7a9e4a8.tar.xz cuberite-3acdf25b058bceef3005eead6e909c27c7a9e4a8.tar.zst cuberite-3acdf25b058bceef3005eead6e909c27c7a9e4a8.zip | |
Diffstat (limited to 'src/Simulator')
| -rw-r--r-- | src/Simulator/FluidSimulator.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Simulator/FluidSimulator.cpp b/src/Simulator/FluidSimulator.cpp index 9c8453d04..ecd74ee52 100644 --- a/src/Simulator/FluidSimulator.cpp +++ b/src/Simulator/FluidSimulator.cpp @@ -133,8 +133,10 @@ Direction cFluidSimulator::GetFlowingDirection(int a_X, int a_Y, int a_Z, bool a /* Disabled because of causing problems and being useless atm char BlockBelow = m_World.GetBlock(a_X, a_Y - 1, a_Z); // If there is nothing or fluid below it -> dominating flow is down :D - if (BlockBelow == E_BLOCK_AIR || IsAllowedBlock(BlockBelow)) + if ((BlockBelow == E_BLOCK_AIR) || IsAllowedBlock(BlockBelow)) + { return Y_MINUS; + } */ NIBBLETYPE LowestPoint = m_World.GetBlockMeta(a_X, a_Y, a_Z); // Current Block Meta so only lower points will be counted @@ -182,7 +184,9 @@ Direction cFluidSimulator::GetFlowingDirection(int a_X, int a_Y, int a_Z, bool a } if (LowestPoint == m_World.GetBlockMeta(a_X, a_Y, a_Z)) + { return NONE; + } if (a_X - X > 0) { |