From c3d6afe47e8e50f9b029caf012c69d1e6ee4e76a Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 1 Aug 2020 11:25:06 +0100 Subject: Corrected wakeup sequences * Pistons/Ice no longer need to FastSetBlock first (#4600), and the former don't drop items when broken in creative - Begin migration away from stationary fluids * Tick the chunk after applying a client's changed * Broadcast pending blocks at the end of a tick --- src/Simulator/DelayedFluidSimulator.cpp | 2 +- src/Simulator/Simulator.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Simulator') 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 AdjacentOffsets + static constexpr std::array AdjacentOffsets { { { 1, 0, 0 }, -- cgit v1.2.3