diff options
| author | Mattes D <github@xoft.cz> | 2014-03-02 16:13:43 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-03-02 16:13:43 +0100 |
| commit | b17d04737d11c5698a6869c70031646723d79f11 (patch) | |
| tree | d71275553552a16dd2b9ba949cd5abf8baf9fa5a /src/Simulator/IncrementalRedstoneSimulator.cpp | |
| parent | Merge pull request #745 from tonibm19/master (diff) | |
| parent | GetById => Get (diff) | |
| download | cuberite-b17d04737d11c5698a6869c70031646723d79f11.tar cuberite-b17d04737d11c5698a6869c70031646723d79f11.tar.gz cuberite-b17d04737d11c5698a6869c70031646723d79f11.tar.bz2 cuberite-b17d04737d11c5698a6869c70031646723d79f11.tar.lz cuberite-b17d04737d11c5698a6869c70031646723d79f11.tar.xz cuberite-b17d04737d11c5698a6869c70031646723d79f11.tar.zst cuberite-b17d04737d11c5698a6869c70031646723d79f11.zip | |
Diffstat (limited to 'src/Simulator/IncrementalRedstoneSimulator.cpp')
| -rw-r--r-- | src/Simulator/IncrementalRedstoneSimulator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Simulator/IncrementalRedstoneSimulator.cpp b/src/Simulator/IncrementalRedstoneSimulator.cpp index 91de9e0cc..0640227b0 100644 --- a/src/Simulator/IncrementalRedstoneSimulator.cpp +++ b/src/Simulator/IncrementalRedstoneSimulator.cpp @@ -566,14 +566,14 @@ void cIncrementalRedstoneSimulator::HandleRedstoneWire(int a_BlockX, int a_Block { if ((i >= 4) && (i <= 7)) // If we are currently checking for wire surrounding ourself one block above... { - if (g_BlockIsSolid[m_World.GetBlock(a_BlockX, a_BlockY + 1, a_BlockZ)]) // If there is something solid above us (wire cut off)... + if (cBlockInfo::IsSolid(m_World.GetBlock(a_BlockX, a_BlockY + 1, a_BlockZ))) // If there is something solid above us (wire cut off)... { continue; // We don't receive power from that wire } } else if ((i >= 8) && (i <= 11)) // See above, but this is for wire below us { - if (g_BlockIsSolid[m_World.GetBlock(a_BlockX + gCrossCoords[i].x, a_BlockY + gCrossCoords[i].y + 1, a_BlockZ + gCrossCoords[i].z)]) + if (cBlockInfo::IsSolid(m_World.GetBlock(a_BlockX + gCrossCoords[i].x, a_BlockY + gCrossCoords[i].y + 1, a_BlockZ + gCrossCoords[i].z))) { continue; } |