diff options
| author | Alexander Harkness <bearbin@gmail.com> | 2014-04-08 15:48:24 +0200 |
|---|---|---|
| committer | Alexander Harkness <bearbin@gmail.com> | 2014-04-08 15:48:24 +0200 |
| commit | 4d32f41b8b01b6c1e74689a3fd73aa3b29b3c940 (patch) | |
| tree | 78052e95d9920e5bd60a02bed9a950d65bbc54ca /src | |
| parent | Merge pull request #862 from mc-server/redstonefix (diff) | |
| download | cuberite-4d32f41b8b01b6c1e74689a3fd73aa3b29b3c940.tar cuberite-4d32f41b8b01b6c1e74689a3fd73aa3b29b3c940.tar.gz cuberite-4d32f41b8b01b6c1e74689a3fd73aa3b29b3c940.tar.bz2 cuberite-4d32f41b8b01b6c1e74689a3fd73aa3b29b3c940.tar.lz cuberite-4d32f41b8b01b6c1e74689a3fd73aa3b29b3c940.tar.xz cuberite-4d32f41b8b01b6c1e74689a3fd73aa3b29b3c940.tar.zst cuberite-4d32f41b8b01b6c1e74689a3fd73aa3b29b3c940.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/Simulator/IncrementalRedstoneSimulator.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Simulator/IncrementalRedstoneSimulator.cpp b/src/Simulator/IncrementalRedstoneSimulator.cpp index fc239169c..9903fc7d3 100644 --- a/src/Simulator/IncrementalRedstoneSimulator.cpp +++ b/src/Simulator/IncrementalRedstoneSimulator.cpp @@ -1211,24 +1211,24 @@ bool cIncrementalRedstoneSimulator::IsRepeaterLocked(int a_BlockX, int a_BlockY, { // If the repeater is facing one direction, do one thing. - case 0x0: + case 0x0: case 0x2: { if (m_World.GetBlock(a_BlockX + 1, a_BlockY, a_BlockZ) == E_BLOCK_REDSTONE_REPEATER_ON) // Is right neighbor a - { + { NIBBLETYPE otherRepeaterDir = m_World.GetBlockMeta(a_BlockX + 1, a_BlockY, a_BlockZ) & 0x3; - if (otherRepeaterDir == 0x1) { return true; } + if (otherRepeaterDir == 0x3) { return true; } } - + if (m_World.GetBlock(a_BlockX - 1, a_BlockY, a_BlockZ) == E_BLOCK_REDSTONE_REPEATER_ON) - { + { NIBBLETYPE otherRepeaterDir = m_World.GetBlockMeta(a_BlockX -1, a_BlockY, a_BlockZ) & 0x3; - if (otherRepeaterDir == 0x3) { return true; } + if (otherRepeaterDir == 0x1) { return true; } } - + break; } - + // If another, do the other. case 0x1: case 0x3: |