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

ChunkStay must be disabled while being deleted.

Browse Source 
Fixes #758.
This commit is contained in:
madmaxoft 2014-04-12 22:35:04 +02:00
parent 75b7244f05
commit 34cf058b02
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChunkStay.cpp
View File

@ -31,10 +31,7 @@ cChunkStay::~cChunkStay()
void cChunkStay::Clear(void) void cChunkStay::Clear(void)
{ {
if (m_ChunkMap != NULL) ASSERT(m_ChunkMap == NULL);
{
Disable();
}
m_Chunks.clear(); m_Chunks.clear();
} }

4
src/ChunkStay.h
View File

@ -36,8 +36,12 @@ class cChunkStay
{ {
public: public:
cChunkStay(void); cChunkStay(void);
/** Deletes the object. Note that this calls Clear(), which means that the ChunkStay needs to be disabled. */
virtual ~cChunkStay(); virtual ~cChunkStay();
/** Clears all the chunks that have been added.
To be used only while the ChunkStay object is not enabled. */
void Clear(void); void Clear(void);
/** Adds a chunk to be locked from unloading. /** Adds a chunk to be locked from unloading.

1
src/LightingThread.cpp
View File

@ -286,6 +286,7 @@ void cLightingThread::LightChunk(cLightingChunkStay & a_Item)
{ {
a_Item.m_CallbackAfter->Call(a_Item.m_ChunkX, a_Item.m_ChunkZ); a_Item.m_CallbackAfter->Call(a_Item.m_ChunkX, a_Item.m_ChunkZ);
} }
a_Item.Disable();
delete &a_Item; delete &a_Item;
} }