diff options
author | Tycho <work.tycho+git@gmail.com> | 2014-09-11 18:48:21 +0200 |
---|---|---|
committer | Tycho <work.tycho+git@gmail.com> | 2014-09-11 18:48:21 +0200 |
commit | 0b044e1c83a62c266afaf0852ccbd5e7b01cec5e (patch) | |
tree | d847314a2ee95b1a766dbb57a06b5ea7e42e687c /src/World.cpp | |
parent | Merge branch 'master' of https://github.com/mc-server/MCServer (diff) | |
download | cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar.gz cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar.bz2 cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar.lz cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar.xz cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar.zst cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.zip |
Diffstat (limited to 'src/World.cpp')
-rw-r--r-- | src/World.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/World.cpp b/src/World.cpp index fdc0aebad..732c9f14c 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -3258,7 +3258,7 @@ void cWorld::SetChunkAlwaysTicked(int a_ChunkX, int a_ChunkZ, bool a_AlwaysTicke -cRedstoneSimulator * cWorld::InitializeRedstoneSimulator(cIniFile & a_IniFile) +cRedstoneSimulator<cChunk, cWorld> * cWorld::InitializeRedstoneSimulator(cIniFile & a_IniFile) { AString SimulatorName = a_IniFile.GetValueSet("Physics", "RedstoneSimulator", "Incremental"); @@ -3268,11 +3268,11 @@ cRedstoneSimulator * cWorld::InitializeRedstoneSimulator(cIniFile & a_IniFile) SimulatorName = "Incremental"; } - cRedstoneSimulator * res = NULL; + cRedstoneSimulator<cChunk, cWorld> * res = NULL; if (NoCaseCompare(SimulatorName, "Incremental") == 0) { - res = new cIncrementalRedstoneSimulator(*this); + res = new cIncrementalRedstoneSimulator<cChunk, cWorld, GetHandlerCompileTime, cChestEntity>(*this); } else if (NoCaseCompare(SimulatorName, "noop") == 0) { |