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

Ensure updating relatives calls the correct base case 

* Fixed recursive base unintentionally scheduling the origin position for an update because it called the wrong function
This commit is contained in:
Tiger Wang 2020-07-28 00:13:07 +01:00
parent 46398f4671
commit 6c47f46c31
9 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Simulator/IncrementalRedstoneSimulator/ObserverHandler.h
View File

@ -87,7 +87,7 @@ public:
a_Chunk.SetMeta(a_Position, a_Meta & ~0x8); a_Chunk.SetMeta(a_Position, a_Meta & ~0x8);
} }
UpdateAdjustedRelatives(a_Chunk, CurrentlyTicking, a_Position + cBlockObserverHandler::GetSignalOutputOffset(a_Meta)); UpdateAdjustedRelative(a_Chunk, CurrentlyTicking, a_Position + cBlockObserverHandler::GetSignalOutputOffset(a_Meta));
} }
virtual void ForValidSourcePositions(cChunk & a_Chunk, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, SourceCallback Callback) const override virtual void ForValidSourcePositions(cChunk & a_Chunk, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, SourceCallback Callback) const override

4
src/Simulator/IncrementalRedstoneSimulator/PoweredRailHandler.h
View File

@ -66,8 +66,8 @@ public:
{ {
a_Chunk.SetMeta(a_Position, (a_PoweringData.PowerLevel == 0) ? (a_Meta & 0x07) : (a_Meta | 0x08)); a_Chunk.SetMeta(a_Position, (a_PoweringData.PowerLevel == 0) ? (a_Meta & 0x07) : (a_Meta | 0x08));
UpdateAdjustedRelatives(a_Chunk, CurrentlyTickingChunk, a_Position + Offset); UpdateAdjustedRelative(a_Chunk, CurrentlyTickingChunk, a_Position + Offset);
UpdateAdjustedRelatives(a_Chunk, CurrentlyTickingChunk, a_Position + -Offset); UpdateAdjustedRelative(a_Chunk, CurrentlyTickingChunk, a_Position + -Offset);
} }
return; return;

2
src/Simulator/IncrementalRedstoneSimulator/PressurePlateHandler.h
View File

@ -72,8 +72,8 @@ public:
static void UpdatePlate(cChunk & Chunk, cChunk & CurrentlyTicking, Vector3i Position) static void UpdatePlate(cChunk & Chunk, cChunk & CurrentlyTicking, Vector3i Position)
{ {
UpdateAdjustedRelative(Chunk, CurrentlyTicking, Position + OffsetYM);
UpdateAdjustedRelatives(Chunk, CurrentlyTicking, Position, RelativeLaterals); UpdateAdjustedRelatives(Chunk, CurrentlyTicking, Position, RelativeLaterals);
UpdateAdjustedRelatives(Chunk, CurrentlyTicking, Position + OffsetYM);
} }
virtual void Update(cChunk & a_Chunk, cChunk & CurrentlyTicking, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, PoweringData a_PoweringData) const override virtual void Update(cChunk & a_Chunk, cChunk & CurrentlyTicking, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, PoweringData a_PoweringData) const override

2
src/Simulator/IncrementalRedstoneSimulator/RedstoneComparatorHandler.h
View File

@ -129,7 +129,7 @@ public:
Data.m_MechanismDelays.erase(a_Position); Data.m_MechanismDelays.erase(a_Position);
// Assume that an update (to front power) is needed: // Assume that an update (to front power) is needed:
UpdateAdjustedRelatives(a_Chunk, CurrentlyTicking, cBlockComparatorHandler::GetFrontCoordinate(a_Position, a_Meta & 0x3)); UpdateAdjustedRelative(a_Chunk, CurrentlyTicking, cBlockComparatorHandler::GetFrontCoordinate(a_Position, a_Meta & 0x3));
} }
} }
} }

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

@ -53,7 +53,7 @@ protected:
} }
template <typename... ArrayTypes> template <typename... ArrayTypes>
static void UpdateAdjustedRelatives(cChunk & From, cChunk & To, const Vector3i Position) static void UpdateAdjustedRelative(cChunk & From, cChunk & To, const Vector3i Position)
{ {
DataForChunk(To).WakeUp(cIncrementalRedstoneSimulatorChunkData::RebaseRelativePosition(From, To, Position)); DataForChunk(To).WakeUp(cIncrementalRedstoneSimulatorChunkData::RebaseRelativePosition(From, To, Position));
} }
@ -70,7 +70,7 @@ protected:
} }
template <typename ArrayType, typename... ArrayTypes> template <typename ArrayType, typename... ArrayTypes>
static void InvokeForAdjustedRelatives(SourceCallback Callback, Vector3i Position, const ArrayType & Relative, const ArrayTypes &... Relatives) static void InvokeForAdjustedRelatives(SourceCallback Callback, const Vector3i Position, const ArrayType & Relative, const ArrayTypes &... Relatives)
{ {
for (const auto Offset : Relative) for (const auto Offset : Relative)
{ {
@ -104,11 +104,11 @@ protected:
private: private:
static void UpdateAdjustedRelatives(cVector3iArray &, Vector3i) static void UpdateAdjustedRelatives(cChunk &, cChunk &, const Vector3i)
{ {
} }
static void InvokeForAdjustedRelatives(SourceCallback, Vector3i) static void InvokeForAdjustedRelatives(SourceCallback, const Vector3i)
{ {
} }
}; };

3
src/Simulator/IncrementalRedstoneSimulator/RedstoneRepeaterHandler.h
View File

@ -63,7 +63,8 @@ public:
// FastSetBlock doesn't wake simulators, so manually update ourselves: // FastSetBlock doesn't wake simulators, so manually update ourselves:
Update(a_Chunk, CurrentlyTicking, a_Position, NewType, a_Meta, a_PoweringData); Update(a_Chunk, CurrentlyTicking, a_Position, NewType, a_Meta, a_PoweringData);
UpdateAdjustedRelatives(a_Chunk, CurrentlyTicking, a_Position + cBlockRedstoneRepeaterHandler::GetFrontCoordinateOffset(a_Meta)); UpdateAdjustedRelative(a_Chunk, CurrentlyTicking, a_Position + cBlockRedstoneRepeaterHandler::GetFrontCoordinateOffset(a_Meta));
UpdateAdjustedRelatives(a_Chunk, CurrentlyTicking, a_Position + cBlockRedstoneRepeaterHandler::GetFrontCoordinateOffset(a_Meta), RelativeAdjacents);
} }
} }
} }

2
src/Simulator/IncrementalRedstoneSimulator/RedstoneTorchHandler.h
View File

@ -79,7 +79,7 @@ public:
{ {
if (Adjacent != GetOffsetAttachedTo(a_Position, a_Meta)) if (Adjacent != GetOffsetAttachedTo(a_Position, a_Meta))
{ {
UpdateAdjustedRelatives(a_Chunk, CurrentlyTicking, a_Position + Adjacent); UpdateAdjustedRelative(a_Chunk, CurrentlyTicking, a_Position + Adjacent);
} }
} }
} }

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

@ -177,12 +177,12 @@ public:
a_Chunk.SetMeta(a_Position, a_PoweringData.PowerLevel); a_Chunk.SetMeta(a_Position, a_PoweringData.PowerLevel);
// Notify block below us to update: // Notify block below us to update:
UpdateAdjustedRelatives(a_Chunk, CurrentlyTicking, a_Position + OffsetYM); UpdateAdjustedRelative(a_Chunk, CurrentlyTicking, a_Position + OffsetYM);
// Notify all terracing positions: // Notify all terracing positions:
ForTerracingConnectionOffsets(a_Chunk, a_Position, [&a_Chunk, &CurrentlyTicking, a_Position](const Vector3i Offset) ForTerracingConnectionOffsets(a_Chunk, a_Position, [&a_Chunk, &CurrentlyTicking, a_Position](const Vector3i Offset)
{ {
UpdateAdjustedRelatives(a_Chunk, CurrentlyTicking, a_Position + Offset); UpdateAdjustedRelative(a_Chunk, CurrentlyTicking, a_Position + Offset);
return false; return false;
}); });
} }

2
src/Simulator/IncrementalRedstoneSimulator/TrappedChestHandler.h
View File

@ -49,7 +49,7 @@ public:
if (Power != PreviousPower.PowerLevel) if (Power != PreviousPower.PowerLevel)
{ {
UpdateAdjustedRelatives(a_Chunk, CurrentlyTicking, OffsetYM); UpdateAdjustedRelative(a_Chunk, CurrentlyTicking, OffsetYM);
UpdateAdjustedRelatives(a_Chunk, CurrentlyTicking, a_Position, RelativeLaterals); UpdateAdjustedRelatives(a_Chunk, CurrentlyTicking, a_Position, RelativeLaterals);
} }
} }