From f7ee5da4c115231df3f4897db04fd308749efe55 Mon Sep 17 00:00:00 2001 From: proller Date: Wed, 18 Sep 2013 01:37:47 +0400 Subject: [PATCH] Fix null dereference in weather update functions --- src/map.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/map.cpp b/src/map.cpp index 55b758055..e8115d39b 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -3935,8 +3935,10 @@ s16 ServerMap::updateBlockHeat(ServerEnvironment *env, v3s16 p, MapBlock *block) f32 heat = m_emerge->biomedef->calcBlockHeat(p, m_seed, env->getTimeOfDayF(), gametime * env->getTimeOfDaySpeed()); - block->heat = heat; - block->weather_update_time = gametime; + if(block) { + block->heat = heat; + block->weather_update_time = gametime; + } return heat; } @@ -3954,8 +3956,10 @@ s16 ServerMap::updateBlockHumidity(ServerEnvironment *env, v3s16 p, MapBlock *bl f32 humidity = m_emerge->biomedef->calcBlockHumidity(p, m_seed, env->getTimeOfDayF(), gametime * env->getTimeOfDaySpeed()); - block->humidity = humidity; - block->weather_update_time = gametime; + if(block) { + block->humidity = humidity; + block->weather_update_time = gametime; + } return humidity; }