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

Changed int parameters to vector parameters in cCuboid and simulators (#3874)

Browse Source
This commit is contained in:
Lane Kolbly
2017-08-17 08:48:38 -05:00
committed by Mattes D
parent 09e94bd947
commit 7bdbfad1bb
39 changed files with 283 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Chunk.cpp
View File

@@ -453,7 +453,10 @@ void cChunk::WriteBlockArea(cBlockArea & a_Area, int a_MinBlockX, int a_MinBlock
} // for y
// Erase all affected block entities:
cCuboid affectedArea(OffX, a_MinBlockY, OffZ, OffX + SizeX - 1, a_MinBlockY + SizeY - 1, OffZ + SizeZ - 1);
cCuboid affectedArea(
{OffX, a_MinBlockY, OffZ},
{OffX + SizeX - 1, a_MinBlockY + SizeY - 1, OffZ + SizeZ - 1}
);
for (auto itr = m_BlockEntities.begin(); itr != m_BlockEntities.end();)
{
if (affectedArea.IsInside(itr->second->GetPos()))
@@ -1489,7 +1492,7 @@ void cChunk::WakeUpSimulators(void)
// The redstone sim takes multiple blocks, use the inbuilt checker
if (RedstoneSimulator->IsAllowedBlock(Block))
{
RedstoneSimulator->AddBlock(BlockX, y, BlockZ, this);
RedstoneSimulator->AddBlock({BlockX, y, BlockZ}, this);
continue;
}
@@ -1497,12 +1500,12 @@ void cChunk::WakeUpSimulators(void)
{
case E_BLOCK_WATER:
{
WaterSimulator->AddBlock(BlockX, y, BlockZ, this);
WaterSimulator->AddBlock({BlockX, y, BlockZ}, this);
break;
}
case E_BLOCK_LAVA:
{
LavaSimulator->AddBlock(BlockX, y, BlockZ, this);
LavaSimulator->AddBlock({BlockX, y, BlockZ}, this);
break;
}
default: