Extex101
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix null dereference in weather update functions

master
proller 2013-09-18 01:37:47 +04:00
parent c0398224ef
commit f7ee5da4c1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/map.cpp
View File

@ -3935,8 +3935,10 @@ s16 ServerMap::updateBlockHeat(ServerEnvironment *env, v3s16 p, MapBlock *block)
f32 heat = m_emerge->biomedef->calcBlockHeat(p, m_seed, f32 heat = m_emerge->biomedef->calcBlockHeat(p, m_seed,
env->getTimeOfDayF(), gametime * env->getTimeOfDaySpeed()); env->getTimeOfDayF(), gametime * env->getTimeOfDaySpeed());
block->heat = heat; if(block) {
block->weather_update_time = gametime; block->heat = heat;
block->weather_update_time = gametime;
}
return heat; return heat;
} }
@ -3954,8 +3956,10 @@ s16 ServerMap::updateBlockHumidity(ServerEnvironment *env, v3s16 p, MapBlock *bl
f32 humidity = m_emerge->biomedef->calcBlockHumidity(p, m_seed, f32 humidity = m_emerge->biomedef->calcBlockHumidity(p, m_seed,
env->getTimeOfDayF(), gametime * env->getTimeOfDaySpeed()); env->getTimeOfDayF(), gametime * env->getTimeOfDaySpeed());
block->humidity = humidity; if(block) {
block->weather_update_time = gametime; block->humidity = humidity;
block->weather_update_time = gametime;
}
return humidity; return humidity;
} }