diff options
| author | daniel0916 <theschokolps@gmail.com> | 2014-04-16 14:31:02 +0200 |
|---|---|---|
| committer | daniel0916 <theschokolps@gmail.com> | 2014-04-16 14:31:02 +0200 |
| commit | 5a9acb7eb6eef293dc53cfe916c74f5cfa069db4 (patch) | |
| tree | 8e0b29c5f0240ac0961e69b905921243130d0258 /src/ChunkStay.cpp | |
| parent | Fixed merge conflict (diff) | |
| parent | Attempted fix for the client crash with the new protocols. (diff) | |
| download | cuberite-5a9acb7eb6eef293dc53cfe916c74f5cfa069db4.tar cuberite-5a9acb7eb6eef293dc53cfe916c74f5cfa069db4.tar.gz cuberite-5a9acb7eb6eef293dc53cfe916c74f5cfa069db4.tar.bz2 cuberite-5a9acb7eb6eef293dc53cfe916c74f5cfa069db4.tar.lz cuberite-5a9acb7eb6eef293dc53cfe916c74f5cfa069db4.tar.xz cuberite-5a9acb7eb6eef293dc53cfe916c74f5cfa069db4.tar.zst cuberite-5a9acb7eb6eef293dc53cfe916c74f5cfa069db4.zip | |
Diffstat (limited to 'src/ChunkStay.cpp')
| -rw-r--r-- | src/ChunkStay.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/ChunkStay.cpp b/src/ChunkStay.cpp index 6b1d5ee34..b5002a63d 100644 --- a/src/ChunkStay.cpp +++ b/src/ChunkStay.cpp @@ -31,10 +31,7 @@ cChunkStay::~cChunkStay() void cChunkStay::Clear(void) { - if (m_ChunkMap != NULL) - { - Disable(); - } + ASSERT(m_ChunkMap == NULL); m_Chunks.clear(); } @@ -97,8 +94,9 @@ void cChunkStay::Disable(void) { ASSERT(m_ChunkMap != NULL); - m_ChunkMap->DelChunkStay(*this); + cChunkMap * ChunkMap = m_ChunkMap; m_ChunkMap = NULL; + ChunkMap->DelChunkStay(*this); } |