diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-07-18 00:37:47 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-07-18 00:37:47 +0200 |
| commit | 84e31ba670c05d38e83cba0bcdfba32d52c01ad9 (patch) | |
| tree | 66935bd267b070fa4f8c4ef6bfc7449d28847016 /src/Simulator | |
| parent | Merge pull request #2365 from bibo38/coreupdate (diff) | |
| parent | Fixed redstone issue (diff) | |
| download | cuberite-84e31ba670c05d38e83cba0bcdfba32d52c01ad9.tar cuberite-84e31ba670c05d38e83cba0bcdfba32d52c01ad9.tar.gz cuberite-84e31ba670c05d38e83cba0bcdfba32d52c01ad9.tar.bz2 cuberite-84e31ba670c05d38e83cba0bcdfba32d52c01ad9.tar.lz cuberite-84e31ba670c05d38e83cba0bcdfba32d52c01ad9.tar.xz cuberite-84e31ba670c05d38e83cba0bcdfba32d52c01ad9.tar.zst cuberite-84e31ba670c05d38e83cba0bcdfba32d52c01ad9.zip | |
Diffstat (limited to 'src/Simulator')
| -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); |