diff options
| author | Mattes D <github@xoft.cz> | 2014-06-19 11:03:40 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-06-19 11:03:40 +0200 |
| commit | 4c7545a82ad8f086c66de7a7cfb26ba1800780fa (patch) | |
| tree | d6a37e6433f973765c8ca63e408dbbd420b08d70 /src/Chunk.cpp | |
| parent | Merge pull request #1096 from mc-server/redstonerefactor (diff) | |
| parent | Nullify deleted pointers. (diff) | |
| download | cuberite-4c7545a82ad8f086c66de7a7cfb26ba1800780fa.tar cuberite-4c7545a82ad8f086c66de7a7cfb26ba1800780fa.tar.gz cuberite-4c7545a82ad8f086c66de7a7cfb26ba1800780fa.tar.bz2 cuberite-4c7545a82ad8f086c66de7a7cfb26ba1800780fa.tar.lz cuberite-4c7545a82ad8f086c66de7a7cfb26ba1800780fa.tar.xz cuberite-4c7545a82ad8f086c66de7a7cfb26ba1800780fa.tar.zst cuberite-4c7545a82ad8f086c66de7a7cfb26ba1800780fa.zip | |
Diffstat (limited to 'src/Chunk.cpp')
| -rw-r--r-- | src/Chunk.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Chunk.cpp b/src/Chunk.cpp index 4703e4536..6ab49036d 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: |