minetest-stuffs/dragonfire-client-waspsaliva
minetest-stuffs/dragonfire-client-waspsaliva
1
0
Fork 0
Code Issues 2 Pull Requests Releases 2 Wiki Activity

src/environment.cpp: Fix NULL pointer dereference

Browse Source
This commit is contained in:
Břetislav Štec 2015-08-01 14:07:12 +02:00 committed by est31
parent 79e2647556
commit 67997af67f
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/environment.cpp
View File

@ -1826,6 +1826,7 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete)
MapBlock *block = m_map->emergeBlock(obj->m_static_block, false); MapBlock *block = m_map->emergeBlock(obj->m_static_block, false);
if (block) {
std::map<u16, StaticObject>::iterator n = std::map<u16, StaticObject>::iterator n =
block->m_static_objects.m_active.find(id); block->m_static_objects.m_active.find(id);
if (n != block->m_static_objects.m_active.end()) { if (n != block->m_static_objects.m_active.end()) {
@ -1843,6 +1844,7 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete)
<<PP(obj->m_static_block)<<std::endl; <<PP(obj->m_static_block)<<std::endl;
} }
} }
}
bool shall_be_written = (!stays_in_same_block || data_changed); bool shall_be_written = (!stays_in_same_block || data_changed);