diff options
| author | Tiger Wang <ziwei.tiger@outlook.com> | 2015-12-19 22:20:56 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@outlook.com> | 2015-12-19 22:20:56 +0100 |
| commit | b8752bb26e91bcdcebfb8dd43e5794251ff70a89 (patch) | |
| tree | 95048f5a2a833c1d43785f6eaea070627c2b9ebe /src/World.cpp | |
| parent | Merge pull request #2776 from cuberite/AtomicBoolIsthread (diff) | |
| parent | Reorganised the redstone simulator (diff) | |
| download | cuberite-b8752bb26e91bcdcebfb8dd43e5794251ff70a89.tar cuberite-b8752bb26e91bcdcebfb8dd43e5794251ff70a89.tar.gz cuberite-b8752bb26e91bcdcebfb8dd43e5794251ff70a89.tar.bz2 cuberite-b8752bb26e91bcdcebfb8dd43e5794251ff70a89.tar.lz cuberite-b8752bb26e91bcdcebfb8dd43e5794251ff70a89.tar.xz cuberite-b8752bb26e91bcdcebfb8dd43e5794251ff70a89.tar.zst cuberite-b8752bb26e91bcdcebfb8dd43e5794251ff70a89.zip | |
Diffstat (limited to 'src/World.cpp')
| -rw-r--r-- | src/World.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/World.cpp b/src/World.cpp index 3f4e8dfea..47a4e9303 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -34,8 +34,8 @@ #include "Simulator/FireSimulator.h" #include "Simulator/NoopFluidSimulator.h" #include "Simulator/NoopRedstoneSimulator.h" +#include "Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.h" #include "Simulator/SandSimulator.h" -#include "Simulator/IncrementalRedstoneSimulator.h" #include "Simulator/VanillaFluidSimulator.h" #include "Simulator/VaporizeFluidSimulator.h" @@ -991,8 +991,6 @@ void cWorld::Tick(std::chrono::milliseconds a_Dt, std::chrono::milliseconds a_La TickWeather(static_cast<float>(a_Dt.count())); - m_ChunkMap->FastSetQueuedBlocks(); - if (m_WorldAge - m_LastSave > std::chrono::minutes(5)) // Save each 5 minutes { SaveAllChunks(); @@ -3626,7 +3624,7 @@ cRedstoneSimulator * cWorld::InitializeRedstoneSimulator(cIniFile & a_IniFile) res = new cRedstoneNoopSimulator(*this); } - m_SimulatorManager->RegisterSimulator(res, 1); + m_SimulatorManager->RegisterSimulator(res, 2 /* Two game ticks is a redstone tick */); return res; } |