summaryrefslogtreecommitdiffstats
path: root/src/Simulator
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2015-04-26 02:16:23 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2015-06-06 13:21:19 +0200
commit151fe0fc595d580264fdb0d394c74ed9fa6df514 (patch)
treec80edaf7d0f4542bcb6e39b1d9958bc0c2a5c54d /src/Simulator
parentRedstone wire and trapdoor fixes (diff)
downloadcuberite-151fe0fc595d580264fdb0d394c74ed9fa6df514.tar
cuberite-151fe0fc595d580264fdb0d394c74ed9fa6df514.tar.gz
cuberite-151fe0fc595d580264fdb0d394c74ed9fa6df514.tar.bz2
cuberite-151fe0fc595d580264fdb0d394c74ed9fa6df514.tar.lz
cuberite-151fe0fc595d580264fdb0d394c74ed9fa6df514.tar.xz
cuberite-151fe0fc595d580264fdb0d394c74ed9fa6df514.tar.zst
cuberite-151fe0fc595d580264fdb0d394c74ed9fa6df514.zip
Diffstat (limited to 'src/Simulator')
-rw-r--r--src/Simulator/IncrementalRedstoneSimulator.cpp24
1 files changed, 17 insertions, 7 deletions
diff --git a/src/Simulator/IncrementalRedstoneSimulator.cpp b/src/Simulator/IncrementalRedstoneSimulator.cpp
index 40829757d..f297f7701 100644
--- a/src/Simulator/IncrementalRedstoneSimulator.cpp
+++ b/src/Simulator/IncrementalRedstoneSimulator.cpp
@@ -640,16 +640,26 @@ void cIncrementalRedstoneSimulator::FindAndPowerBorderingWires(std::vector<std::
auto Neighbour = a_Entry.second->GetRelNeighborChunkAdjustCoords(AdjustedPos.x, AdjustedPos.z);
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)))
{
- 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;
- ((cIncrementalRedstoneSimulatorChunkData *)Neighbour->GetRedstoneSimulatorData())->m_PoweredBlocks.emplace_back(RC); // We need to insert the value into the chunk who owns the block position
+ 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; });
+ if (Position != PoweredBlocks.end())
+ {
+ Position->a_PowerLevel = RC.a_PowerLevel;
+ }
+ else
+ {
+ PoweredBlocks.emplace_back(RC);
- Neighbour->SetIsRedstoneDirty(true);
- m_Chunk->SetIsRedstoneDirty(true);
+ Neighbour->SetIsRedstoneDirty(true);
+ m_Chunk->SetIsRedstoneDirty(true);
+ }
Neighbour->SetMeta(AdjustedPos.x, AdjustedPos.y, AdjustedPos.z, MyPower - 1);
a_PotentialWireList.emplace_back(std::make_pair(AdjustedPos, Neighbour));