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

Fixed wire consuming much resources

Browse Source
This commit is contained in:
Tiger Wang 2015-04-26 01:16:23 +01:00
parent 84534dfeb2
commit 151fe0fc59
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Simulator/IncrementalRedstoneSimulator.cpp
View File

@ -640,16 +640,26 @@ void cIncrementalRedstoneSimulator::FindAndPowerBorderingWires(std::vector<std::
auto Neighbour = a_Entry.second->GetRelNeighborChunkAdjustCoords(AdjustedPos.x, AdjustedPos.z); auto Neighbour = a_Entry.second->GetRelNeighborChunkAdjustCoords(AdjustedPos.x, AdjustedPos.z);
auto MyPower = IsWirePowered(a_Entry.first, a_Entry.second); auto MyPower = IsWirePowered(a_Entry.first, a_Entry.second);
auto & PoweredBlocks = ((cIncrementalRedstoneSimulatorChunkData *)Neighbour->GetRedstoneSimulatorData())->m_PoweredBlocks; // We need to insert the value into the chunk who owns the block position
sPoweredBlocks RC;
RC.a_BlockPos = AdjustedPos;
RC.a_SourcePos = a_Entry.first + Vector3i((a_Entry.second->GetPosX() - Neighbour->GetPosX()) * cChunkDef::Width, 0, (a_Entry.second->GetPosZ() - Neighbour->GetPosZ()) * cChunkDef::Width);
RC.a_PowerLevel = MyPower - 1;
if ((Neighbour->GetBlock(AdjustedPos) == E_BLOCK_REDSTONE_WIRE) && (MyPower > 1) && (MyPower > IsWirePowered(AdjustedPos, Neighbour))) if ((Neighbour->GetBlock(AdjustedPos) == E_BLOCK_REDSTONE_WIRE) && (MyPower > 1) && (MyPower > IsWirePowered(AdjustedPos, Neighbour)))
{ {
sPoweredBlocks RC; auto Position = std::find_if(PoweredBlocks.begin(), PoweredBlocks.end(), [RC](const sPoweredBlocks & itr) { return itr.a_BlockPos == RC.a_BlockPos && itr.a_SourcePos == RC.a_SourcePos; });
RC.a_BlockPos = AdjustedPos; if (Position != PoweredBlocks.end())
RC.a_SourcePos = a_Entry.first + Vector3i((a_Entry.second->GetPosX() - Neighbour->GetPosX()) * cChunkDef::Width, 0, (a_Entry.second->GetPosZ() - Neighbour->GetPosZ()) * cChunkDef::Width); {
RC.a_PowerLevel = MyPower - 1; Position->a_PowerLevel = RC.a_PowerLevel;
((cIncrementalRedstoneSimulatorChunkData *)Neighbour->GetRedstoneSimulatorData())->m_PoweredBlocks.emplace_back(RC); // We need to insert the value into the chunk who owns the block position }
else
{
PoweredBlocks.emplace_back(RC);
Neighbour->SetIsRedstoneDirty(true); Neighbour->SetIsRedstoneDirty(true);
m_Chunk->SetIsRedstoneDirty(true); m_Chunk->SetIsRedstoneDirty(true);
}
Neighbour->SetMeta(AdjustedPos.x, AdjustedPos.y, AdjustedPos.z, MyPower - 1); Neighbour->SetMeta(AdjustedPos.x, AdjustedPos.y, AdjustedPos.z, MyPower - 1);
a_PotentialWireList.emplace_back(std::make_pair(AdjustedPos, Neighbour)); a_PotentialWireList.emplace_back(std::make_pair(AdjustedPos, Neighbour));