diff options
| author | Tiger Wang <ziwei.tiger@outlook.com> | 2020-08-01 12:25:06 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@outlook.com> | 2020-08-04 19:15:18 +0200 |
| commit | c3d6afe47e8e50f9b029caf012c69d1e6ee4e76a (patch) | |
| tree | 26ac0ff00942aef4deafdc2048f8c14a168f4f93 /src/Simulator | |
| parent | OnBroken/OnPlaced are for entity actions (diff) | |
| download | cuberite-c3d6afe47e8e50f9b029caf012c69d1e6ee4e76a.tar cuberite-c3d6afe47e8e50f9b029caf012c69d1e6ee4e76a.tar.gz cuberite-c3d6afe47e8e50f9b029caf012c69d1e6ee4e76a.tar.bz2 cuberite-c3d6afe47e8e50f9b029caf012c69d1e6ee4e76a.tar.lz cuberite-c3d6afe47e8e50f9b029caf012c69d1e6ee4e76a.tar.xz cuberite-c3d6afe47e8e50f9b029caf012c69d1e6ee4e76a.tar.zst cuberite-c3d6afe47e8e50f9b029caf012c69d1e6ee4e76a.zip | |
Diffstat (limited to 'src/Simulator')
| -rw-r--r-- | src/Simulator/DelayedFluidSimulator.cpp | 2 | ||||
| -rw-r--r-- | src/Simulator/Simulator.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Simulator/DelayedFluidSimulator.cpp b/src/Simulator/DelayedFluidSimulator.cpp index ec1918617..9bec01359 100644 --- a/src/Simulator/DelayedFluidSimulator.cpp +++ b/src/Simulator/DelayedFluidSimulator.cpp @@ -121,7 +121,7 @@ void cDelayedFluidSimulator::SimulateChunk(std::chrono::milliseconds a_Dt, int a void cDelayedFluidSimulator::AddBlock(cChunk & a_Chunk, Vector3i a_Position, BLOCKTYPE a_Block) { - if (a_Block != m_FluidBlock) + if ((a_Block != m_FluidBlock) && (a_Block != m_StationaryFluidBlock)) { return; } diff --git a/src/Simulator/Simulator.h b/src/Simulator/Simulator.h index f82b579cb..e18465bee 100644 --- a/src/Simulator/Simulator.h +++ b/src/Simulator/Simulator.h @@ -28,7 +28,7 @@ public: virtual ~cSimulator() {} // Contains our direct adjacents - inline static std::array<Vector3i, 6> AdjacentOffsets + static constexpr std::array<Vector3i, 6> AdjacentOffsets { { { 1, 0, 0 }, |