summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2016-02-20 21:11:03 +0100
committerAlexander Harkness <me@bearbin.net>2016-02-20 21:11:03 +0100
commitfa0159b08212228534c0bda1941e9ef1e103fe38 (patch)
tree1221070fe85ad8a3caf19e90eac5471a021e5af0 /src
parentMerge pull request #3026 from iam10K/master (diff)
parentFix #3030 (diff)
downloadcuberite-fa0159b08212228534c0bda1941e9ef1e103fe38.tar
cuberite-fa0159b08212228534c0bda1941e9ef1e103fe38.tar.gz
cuberite-fa0159b08212228534c0bda1941e9ef1e103fe38.tar.bz2
cuberite-fa0159b08212228534c0bda1941e9ef1e103fe38.tar.lz
cuberite-fa0159b08212228534c0bda1941e9ef1e103fe38.tar.xz
cuberite-fa0159b08212228534c0bda1941e9ef1e103fe38.tar.zst
cuberite-fa0159b08212228534c0bda1941e9ef1e103fe38.zip
Diffstat (limited to 'src')
-rw-r--r--src/Chunk.cpp10
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;
}
-
-
-
-
-
-
-
-