diff options
| author | scribblemaniac <connor.deptuck@gmail.com> | 2015-07-16 05:30:53 +0200 |
|---|---|---|
| committer | scribblemaniac <connor.deptuck@gmail.com> | 2015-07-17 08:48:21 +0200 |
| commit | 00c3144283d12a96366d48dda5b3af6bad3550c2 (patch) | |
| tree | 9d544e74a644289f21269c9a0aa7dc53d242a0f2 | |
| parent | Merge pull request #2350 from SamJBarney/PeonySnowFix (diff) | |
| download | cuberite-00c3144283d12a96366d48dda5b3af6bad3550c2.tar cuberite-00c3144283d12a96366d48dda5b3af6bad3550c2.tar.gz cuberite-00c3144283d12a96366d48dda5b3af6bad3550c2.tar.bz2 cuberite-00c3144283d12a96366d48dda5b3af6bad3550c2.tar.lz cuberite-00c3144283d12a96366d48dda5b3af6bad3550c2.tar.xz cuberite-00c3144283d12a96366d48dda5b3af6bad3550c2.tar.zst cuberite-00c3144283d12a96366d48dda5b3af6bad3550c2.zip | |
| -rw-r--r-- | src/Simulator/IncrementalRedstoneSimulator.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Simulator/IncrementalRedstoneSimulator.cpp b/src/Simulator/IncrementalRedstoneSimulator.cpp index ba921a57e..74aa069a1 100644 --- a/src/Simulator/IncrementalRedstoneSimulator.cpp +++ b/src/Simulator/IncrementalRedstoneSimulator.cpp @@ -645,7 +645,8 @@ void cIncrementalRedstoneSimulator::FindAndPowerBorderingWires(std::vector<std:: if ( (Neighbour->GetBlock(AdjustedPos) == E_BLOCK_REDSTONE_WIRE) && - (!cBlockInfo::FullyOccupiesVoxel(a_EntryChunk->GetBlock(a_EntryRelBlockPosition.x, a_EntryRelBlockPosition.y + 1, a_EntryRelBlockPosition.z))) && + (!cBlockInfo::FullyOccupiesVoxel(a_EntryChunk->GetBlock(a_EntryRelBlockPosition.x, a_EntryRelBlockPosition.y + 1, a_EntryRelBlockPosition.z)) || + (a_EntryChunk->GetBlock(a_EntryRelBlockPosition.x, a_EntryRelBlockPosition.y + 1, a_EntryRelBlockPosition.z) == E_BLOCK_GLOWSTONE)) && (MyPower > 1) && (MyPower > IsWirePowered(AdjustedPos, Neighbour))) { PowerBorderingWires(a_PotentialWireList, a_EntryRelBlockPosition, a_EntryChunk, AdjustedPos, Neighbour, MyPower); @@ -665,7 +666,8 @@ void cIncrementalRedstoneSimulator::FindAndPowerBorderingWires(std::vector<std:: if ( (Neighbour->GetBlock(AdjustedPos) == E_BLOCK_REDSTONE_WIRE) && - (!cBlockInfo::FullyOccupiesVoxel(Neighbour->GetBlock(AdjustedPos.x, AdjustedPos.y + 1, AdjustedPos.z))) && + (!cBlockInfo::FullyOccupiesVoxel(Neighbour->GetBlock(AdjustedPos.x, AdjustedPos.y + 1, AdjustedPos.z)) || + (Neighbour->GetBlock(AdjustedPos.x, AdjustedPos.y + 1, AdjustedPos.z) == E_BLOCK_GLOWSTONE)) && (MyPower > 1) && (MyPower > IsWirePowered(AdjustedPos, Neighbour))) { PowerBorderingWires(a_PotentialWireList, a_EntryRelBlockPosition, a_EntryChunk, AdjustedPos, Neighbour, MyPower); |