flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #2848 from Nakkar/master 

Fix for issue #2218
This commit is contained in:
Alexander Harkness 2016-01-11 19:09:23 +00:00
parent 725db4475c 8c7cc3ffe9
commit 1f9908c712
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Simulator/IncrementalRedstoneSimulator/RedstoneWireHandler.h
View File

@ -35,7 +35,8 @@ public:
const cVector3iArray GetTerracingConnectionOffsets(const Vector3i & a_Position)
{
cVector3iArray RelativePositions;
bool IsYPTerracingBlocked = cBlockInfo::IsSolid(m_World.GetBlock(a_Position + OffsetYP()));
auto YPTerraceBlock = m_World.GetBlock(a_Position + OffsetYP());
bool IsYPTerracingBlocked = cBlockInfo::IsSolid(YPTerraceBlock) && !cBlockInfo::IsTransparent(YPTerraceBlock);
for (const auto & Adjacent : GetRelativeLaterals())
{
@ -46,9 +47,10 @@ public:
{
RelativePositions.emplace_back(Adjacent + OffsetYP());
}
auto YMTerraceBlock = m_World.GetBlock(a_Position + Adjacent);
if (
!cBlockInfo::IsSolid(m_World.GetBlock(a_Position + Adjacent)) && // IsYMTerracingBlocked (i.e. check block above lower terracing position, a.k.a. just the plain adjacent)
// IsYMTerracingBlocked (i.e. check block above lower terracing position, a.k.a. just the plain adjacent)
(!cBlockInfo::IsSolid(YMTerraceBlock) || cBlockInfo::IsTransparent(YMTerraceBlock)) &&
(m_World.GetBlock(a_Position + Adjacent + OffsetYM()) == E_BLOCK_REDSTONE_WIRE)
)
{