Chest, weather, crash, and miscellaneous fixes (#5215)
* Alpha-sort cChestEntity * Chests: use SendUpdateBlockEntity * Pathfinder: fix out of range Y * 1.13: correct weather packet ID * Chests: fix neighbour scanner + Add OnAddToWorld and overload to scan neighbours there, instead of in the constructor/OnUse. This fixes hoppers accessing newly loaded double chests and seeing a null m_Neighbour, thus thinking its a single chest. * Fix typo in cross coords computation. * Simplify hopper logic. * Block entities: ASSERT that type is correct If you match the block type first before calling DoWithBlockEntity, the corresponding block entity must either be empty or correspond to the block type. * Chunk: fix some forgotten PendingSendBE cleanup + Add cleanup in SetAllData, WriteBlockArea - Remove RemoveBlockEntity (used once), HasBlockEntity (not used) * Replace MakeIndex with MakeIndexNoCheck * Remove extraneous MarkDirty in hopper & chests
This commit is contained in:
@@ -513,7 +513,7 @@ void cCaveTunnel::ProcessChunk(
|
||||
{
|
||||
if (cChunkDef::GetBlock(a_BlockTypes, x, y, z) == E_BLOCK_SAND)
|
||||
{
|
||||
int Index = cChunkDef::MakeIndexNoCheck(x, y, z);
|
||||
const auto Index = cChunkDef::MakeIndex(x, y, z);
|
||||
if (a_BlockMetas[Index] == 1)
|
||||
{
|
||||
a_BlockMetas[Index] = 0;
|
||||
|
||||
@@ -572,8 +572,8 @@ void cChunkDesc::RandomFillRelCuboid(
|
||||
|
||||
cBlockEntity * cChunkDesc::GetBlockEntity(int a_RelX, int a_RelY, int a_RelZ)
|
||||
{
|
||||
auto Idx = static_cast<size_t>(cChunkDef::MakeIndex(a_RelX, a_RelY, a_RelZ));
|
||||
auto itr = m_BlockEntities.find(Idx);
|
||||
const auto Idx = cChunkDef::MakeIndex(a_RelX, a_RelY, a_RelZ);
|
||||
const auto itr = m_BlockEntities.find(Idx);
|
||||
|
||||
if (itr != m_BlockEntities.end())
|
||||
{
|
||||
|
||||
@@ -1227,7 +1227,7 @@ void cFinishGenBottomLava::GenFinish(cChunkDesc & a_ChunkDesc)
|
||||
{
|
||||
for (int z = 0; z < cChunkDef::Width; z++) for (int x = 0; x < cChunkDef::Width; x++)
|
||||
{
|
||||
int Index = cChunkDef::MakeIndexNoCheck(x, y, z);
|
||||
const auto Index = cChunkDef::MakeIndex(x, y, z);
|
||||
if (BlockTypes[Index] == E_BLOCK_AIR)
|
||||
{
|
||||
BlockTypes[Index] = E_BLOCK_STATIONARY_LAVA;
|
||||
@@ -2000,8 +2000,8 @@ void cFinishGenOreNests::GenerateOre(
|
||||
continue;
|
||||
}
|
||||
|
||||
int Index = cChunkDef::MakeIndexNoCheck(BlockX, BlockY, BlockZ);
|
||||
auto blockType = blockTypes[Index];
|
||||
const auto Index = cChunkDef::MakeIndex(BlockX, BlockY, BlockZ);
|
||||
const auto blockType = blockTypes[Index];
|
||||
if ((blockType == E_BLOCK_STONE) || (blockType == E_BLOCK_NETHERRACK))
|
||||
{
|
||||
blockTypes[Index] = a_OreType;
|
||||
|
||||
Reference in New Issue
Block a user