diff options
| author | Alexander Harkness <me@bearbin.net> | 2016-02-20 19:39:01 +0100 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2016-02-20 19:42:43 +0100 |
| commit | e628908a7db200d89fbb4a61d59c263c92cb20cb (patch) | |
| tree | 1221070fe85ad8a3caf19e90eac5471a021e5af0 /src/Chunk.cpp | |
| parent | Merge pull request #3026 from iam10K/master (diff) | |
| download | cuberite-e628908a7db200d89fbb4a61d59c263c92cb20cb.tar cuberite-e628908a7db200d89fbb4a61d59c263c92cb20cb.tar.gz cuberite-e628908a7db200d89fbb4a61d59c263c92cb20cb.tar.bz2 cuberite-e628908a7db200d89fbb4a61d59c263c92cb20cb.tar.lz cuberite-e628908a7db200d89fbb4a61d59c263c92cb20cb.tar.xz cuberite-e628908a7db200d89fbb4a61d59c263c92cb20cb.tar.zst cuberite-e628908a7db200d89fbb4a61d59c263c92cb20cb.zip | |
Diffstat (limited to 'src/Chunk.cpp')
| -rw-r--r-- | src/Chunk.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/Chunk.cpp b/src/Chunk.cpp index 237bf62c0..fa479bf9a 100644 --- a/src/Chunk.cpp +++ b/src/Chunk.cpp @@ -654,12 +654,12 @@ void cChunk::Tick(std::chrono::milliseconds a_Dt) (*itr)->SetParentChunk(nullptr); MoveEntityToNewChunk(*itr); - itr = m_Entities.erase(itr); // Mark as dirty if it was a server-generated entity: if (!(*itr)->IsPlayer()) { MarkDirty(); } + itr = m_Entities.erase(itr); } else { @@ -3189,11 +3189,3 @@ NIBBLETYPE cChunk::GetTimeAlteredLight(NIBBLETYPE a_Skylight) const // Because NIBBLETYPE is unsigned, we clamp it to 0 .. 15 by checking for values above 15 return (a_Skylight < 16)? a_Skylight : 0; } - - - - - - - - |