diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-06-12 19:51:33 +0200 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-06-12 19:51:33 +0200 |
| commit | 93d4a8aa92af58bb073f18c87167358d18632899 (patch) | |
| tree | b32c5989a7db0f62bba51763504f5466c60f5176 /src/Chunk.cpp | |
| parent | Fixed compile (diff) | |
| download | cuberite-93d4a8aa92af58bb073f18c87167358d18632899.tar cuberite-93d4a8aa92af58bb073f18c87167358d18632899.tar.gz cuberite-93d4a8aa92af58bb073f18c87167358d18632899.tar.bz2 cuberite-93d4a8aa92af58bb073f18c87167358d18632899.tar.lz cuberite-93d4a8aa92af58bb073f18c87167358d18632899.tar.xz cuberite-93d4a8aa92af58bb073f18c87167358d18632899.tar.zst cuberite-93d4a8aa92af58bb073f18c87167358d18632899.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Chunk.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Chunk.cpp b/src/Chunk.cpp index c9e4f5411..7ca0a4afd 100644 --- a/src/Chunk.cpp +++ b/src/Chunk.cpp @@ -86,7 +86,7 @@ cChunk::cChunk( m_NeighborZP(a_NeighborZP), m_WaterSimulatorData(a_World->GetWaterSimulator()->CreateChunkData()), m_LavaSimulatorData (a_World->GetLavaSimulator ()->CreateChunkData()), - m_EntityTickIteratorData(std::make_pair(false, &m_Entities.end())) + m_EntityTickIteratorData(std::make_pair(false, m_Entities.end())) { if (a_NeighborXM != NULL) { @@ -584,12 +584,12 @@ void cChunk::Tick(float a_Dt) // Don't tick things queued to be removed if (!((*itr)->IsMob())) { - m_EntityTickIteratorData.second = &itr; + m_EntityTickIteratorData.second = itr; (*itr)->Tick(a_Dt, *this); - if (itr != *m_EntityTickIteratorData.second) + if (itr != m_EntityTickIteratorData.second) { - itr = *m_EntityTickIteratorData.second; + itr = m_EntityTickIteratorData.second; } else { @@ -1876,7 +1876,7 @@ void cChunk::RemoveEntity(cEntity * a_Entity) { if (m_EntityTickIteratorData.first) { - *m_EntityTickIteratorData.second = m_Entities.erase(*m_EntityTickIteratorData.second); + m_EntityTickIteratorData.second = m_Entities.erase(m_EntityTickIteratorData.second); } else { |