summaryrefslogtreecommitdiffstats
path: root/src/Chunk.cpp
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-06-26 15:49:53 +0200
committerHowaner <franzi.moos@googlemail.com>2014-06-26 15:49:53 +0200
commiteaf36766f60662a0aa7829ae3d96f47fd91b408d (patch)
tree3075c09f947dfbaff163c405c74f518a8064ea89 /src/Chunk.cpp
parentderp (diff)
parentMerge pull request #1126 from mc-server/BlockInfoInit (diff)
downloadcuberite-eaf36766f60662a0aa7829ae3d96f47fd91b408d.tar
cuberite-eaf36766f60662a0aa7829ae3d96f47fd91b408d.tar.gz
cuberite-eaf36766f60662a0aa7829ae3d96f47fd91b408d.tar.bz2
cuberite-eaf36766f60662a0aa7829ae3d96f47fd91b408d.tar.lz
cuberite-eaf36766f60662a0aa7829ae3d96f47fd91b408d.tar.xz
cuberite-eaf36766f60662a0aa7829ae3d96f47fd91b408d.tar.zst
cuberite-eaf36766f60662a0aa7829ae3d96f47fd91b408d.zip
Diffstat (limited to 'src/Chunk.cpp')
-rw-r--r--src/Chunk.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/Chunk.cpp b/src/Chunk.cpp
index 4703e4536..1320d5ccd 100644
--- a/src/Chunk.cpp
+++ b/src/Chunk.cpp
@@ -152,7 +152,9 @@ cChunk::~cChunk()
m_NeighborZP->m_NeighborZM = NULL;
}
delete m_WaterSimulatorData;
+ m_WaterSimulatorData = NULL;
delete m_LavaSimulatorData;
+ m_LavaSimulatorData = NULL;
}
@@ -596,6 +598,7 @@ void cChunk::Tick(float a_Dt)
cEntity * ToDelete = *itr;
itr = m_Entities.erase(itr);
delete ToDelete;
+ ToDelete = NULL;
continue;
}
++itr;
@@ -1417,6 +1420,7 @@ void cChunk::SetBlock(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType,
BlockEntity->Destroy();
RemoveBlockEntity(BlockEntity);
delete BlockEntity;
+ BlockEntity = NULL;
}
// If the new block is a block entity, create the entity object:
@@ -1612,6 +1616,12 @@ void cChunk::AddBlockEntity(cBlockEntity * a_BlockEntity)
cBlockEntity * cChunk::GetBlockEntity(int a_BlockX, int a_BlockY, int a_BlockZ)
{
+ // Check that the query coords are within chunk bounds:
+ ASSERT(a_BlockX >= m_PosX * cChunkDef::Width);
+ ASSERT(a_BlockX < m_PosX * cChunkDef::Width + cChunkDef::Width);
+ ASSERT(a_BlockZ >= m_PosZ * cChunkDef::Width);
+ ASSERT(a_BlockZ < m_PosZ * cChunkDef::Width + cChunkDef::Width);
+
for (cBlockEntityList::iterator itr = m_BlockEntities.begin(); itr != m_BlockEntities.end(); ++itr)
{
if (