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

Redstone fixes (#3285)

Browse Source 
* Comparators and pistons no longer update instantly
* Fixes #3168.
* Consolidated comparator code
* As a result, fixed an issue where GetPowerLevel didn't consider block
entities behind it (only GetFrontPowerLevel did)
This commit is contained in:
Tiger Wang
2016-07-31 21:54:35 +01:00
committed by GitHub
parent a4ca689974
commit d46f7ce2c8
4 changed files with 102 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Simulator/IncrementalRedstoneSimulator/PistonHandler.h
View File

@@ -39,14 +39,37 @@ public:
virtual cVector3iArray Update(const Vector3i & a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, PoweringData a_PoweringData) override
{
// LOGD("Evaluating pisty the piston (%d %d %d)", a_Position.x, a_Position.y, a_Position.z);
auto Data = static_cast<cIncrementalRedstoneSimulator *>(m_World.GetRedstoneSimulator())->GetChunkData();
auto DelayInfo = Data->GetMechanismDelayInfo(a_Position);
if (a_PoweringData.PowerLevel > 0)
// Delay is used here to prevent an infinite loop (#3168)
if (DelayInfo == nullptr)
{
cBlockPistonHandler::ExtendPiston(a_Position, &m_World);
bool ShouldBeExtended = (a_PoweringData.PowerLevel != 0);
if (ShouldBeExtended != cBlockPistonHandler::IsExtended(a_Meta))
{
Data->m_MechanismDelays[a_Position] = std::make_pair(1, ShouldBeExtended);
}
}
else
{
cBlockPistonHandler::RetractPiston(a_Position, &m_World);
int DelayTicks;
bool ShouldBeExtended;
std::tie(DelayTicks, ShouldBeExtended) = *DelayInfo;
if (DelayTicks == 0)
{
if (ShouldBeExtended)
{
cBlockPistonHandler::ExtendPiston(a_Position, &m_World);
}
else
{
cBlockPistonHandler::RetractPiston(a_Position, &m_World);
}
Data->m_MechanismDelays.erase(a_Position);
}
}
return {};