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

Merge pull request #3032 from cuberite/3030-fix

Browse Source 
Fix #3030
This commit is contained in:
Alexander Harkness 2016-02-20 20:11:03 +00:00
commit fa0159b082
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Chunk.cpp
View File

@ -654,12 +654,12 @@ void cChunk::Tick(std::chrono::milliseconds a_Dt)
(*itr)->SetParentChunk(nullptr); (*itr)->SetParentChunk(nullptr);
MoveEntityToNewChunk(*itr); MoveEntityToNewChunk(*itr);
itr = m_Entities.erase(itr);
// Mark as dirty if it was a server-generated entity: // Mark as dirty if it was a server-generated entity:
if (!(*itr)->IsPlayer()) if (!(*itr)->IsPlayer())
{ {
MarkDirty(); MarkDirty();
} }
itr = m_Entities.erase(itr);
} }
else 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 // Because NIBBLETYPE is unsigned, we clamp it to 0 .. 15 by checking for values above 15
return (a_Skylight < 16)? a_Skylight : 0; return (a_Skylight < 16)? a_Skylight : 0;
} }