diff options
| author | Mattes D <github@xoft.cz> | 2014-10-24 10:13:54 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-10-24 10:13:54 +0200 |
| commit | 2940ced832e506fb1bb2b5292d49b2c7c31afb5b (patch) | |
| tree | 9b5c06b80b752eda2cb5dd25d271d50d9eb1dc1f /src/Simulator | |
| parent | Reimplemented cEvent using C++11 primitives. (diff) | |
| parent | Merge pull request #1565 from mc-server/MergedIniFile (diff) | |
| download | cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.gz cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.bz2 cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.lz cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.xz cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.zst cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Simulator/IncrementalRedstoneSimulator.inc | 1 | ||||
| -rw-r--r-- | src/Simulator/SandSimulator.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/Simulator/IncrementalRedstoneSimulator.inc b/src/Simulator/IncrementalRedstoneSimulator.inc index 200fc0971..2d03584e2 100644 --- a/src/Simulator/IncrementalRedstoneSimulator.inc +++ b/src/Simulator/IncrementalRedstoneSimulator.inc @@ -2001,7 +2001,6 @@ bool cIncrementalRedstoneSimulator<ChunkType, WorldType, GetHandlerCompileTime, // Check if western(left) neighbor is a powered on repeater who is facing us if (m_Chunk->UnboundedRelGetBlock(a_RelBlockX - 1, a_RelBlockY, a_RelBlockZ, Block, OtherRepeaterDir) && (Block == E_BLOCK_REDSTONE_REPEATER_ON)) { - NIBBLETYPE OtherRepeaterDir = m_Chunk->GetMeta(a_RelBlockX -1, a_RelBlockY, a_RelBlockZ) & 0x3; if ((OtherRepeaterDir & 0x03) == 0x1) { return true; diff --git a/src/Simulator/SandSimulator.cpp b/src/Simulator/SandSimulator.cpp index 073518b31..dfbd3e458 100644 --- a/src/Simulator/SandSimulator.cpp +++ b/src/Simulator/SandSimulator.cpp @@ -7,7 +7,7 @@ #include "../Defines.h" #include "../Entities/FallingBlock.h" #include "../Chunk.h" -#include "inifile/iniFile.h" +#include "../IniFile.h" |