diff options
author | Masy98 <masy@antheruscraft.de> | 2014-08-30 21:31:51 +0200 |
---|---|---|
committer | Masy98 <masy@antheruscraft.de> | 2014-08-30 21:31:51 +0200 |
commit | 2d5a38bd61aa9436f2944f26344b14f92e30f025 (patch) | |
tree | d1caaf6446574ffdf676c272e39404ed8184a33b /src/SetChunkData.cpp | |
parent | Fixed slab name (diff) | |
parent | cChunk: Fixed the Coords param. (diff) | |
download | cuberite-2d5a38bd61aa9436f2944f26344b14f92e30f025.tar cuberite-2d5a38bd61aa9436f2944f26344b14f92e30f025.tar.gz cuberite-2d5a38bd61aa9436f2944f26344b14f92e30f025.tar.bz2 cuberite-2d5a38bd61aa9436f2944f26344b14f92e30f025.tar.lz cuberite-2d5a38bd61aa9436f2944f26344b14f92e30f025.tar.xz cuberite-2d5a38bd61aa9436f2944f26344b14f92e30f025.tar.zst cuberite-2d5a38bd61aa9436f2944f26344b14f92e30f025.zip |
Diffstat (limited to '')
-rw-r--r-- | src/SetChunkData.cpp | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/src/SetChunkData.cpp b/src/SetChunkData.cpp index 6e0c2733e..97903074a 100644 --- a/src/SetChunkData.cpp +++ b/src/SetChunkData.cpp @@ -5,6 +5,7 @@ #include "Globals.h" #include "SetChunkData.h" +#include "BlockEntities/BlockEntity.h" @@ -13,6 +14,9 @@ cSetChunkData::cSetChunkData(int a_ChunkX, int a_ChunkZ, bool a_ShouldMarkDirty) : m_ChunkX(a_ChunkX), m_ChunkZ(a_ChunkZ), + m_IsLightValid(false), + m_IsHeightMapValid(false), + m_AreBiomesValid(false), m_ShouldMarkDirty(a_ShouldMarkDirty) { } @@ -113,3 +117,35 @@ void cSetChunkData::CalculateHeightMap(void) + +void cSetChunkData::RemoveInvalidBlockEntities(void) +{ + for (cBlockEntityList::iterator itr = m_BlockEntities.begin(); itr != m_BlockEntities.end();) + { + BLOCKTYPE EntityBlockType = (*itr)->GetBlockType(); + BLOCKTYPE WorldBlockType = cChunkDef::GetBlock(m_BlockTypes, (*itr)->GetRelX(), (*itr)->GetPosY(), (*itr)->GetRelZ()); + if (EntityBlockType != WorldBlockType) + { + // Bad blocktype, remove the block entity: + LOGD("Block entity blocktype mismatch at {%d, %d, %d}: entity for blocktype %s(%d) in block %s(%d). Deleting the block entity.", + (*itr)->GetPosX(), (*itr)->GetPosY(), (*itr)->GetPosZ(), + ItemTypeToString(EntityBlockType).c_str(), EntityBlockType, + ItemTypeToString(WorldBlockType).c_str(), WorldBlockType + ); + cBlockEntityList::iterator itr2 = itr; + itr2++; + m_BlockEntities.erase(itr); + delete *itr; + itr = itr2; + } + else + { + // Good blocktype, keep the block entity: + ++itr; + } + } // for itr - m_BlockEntities[] +} + + + + |