Fix null dereference in weather update functions

diff --git a/src/map.cpp b/src/map.cpp
index 55b7580558051ba54b0d7ecab56b5330e3213440..e8115d39b8481e4c548f0709c65df975b80cee03 100644 (file)
--- 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;
 }