Skip to content

Commit f7ee5da

Browse files
committed
Fix null dereference in weather update functions
1 parent c039822 commit f7ee5da

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/map.cpp

+8-4
Original file line numberDiff line numberDiff line change
@@ -3935,8 +3935,10 @@ s16 ServerMap::updateBlockHeat(ServerEnvironment *env, v3s16 p, MapBlock *block)
39353935
f32 heat = m_emerge->biomedef->calcBlockHeat(p, m_seed,
39363936
env->getTimeOfDayF(), gametime * env->getTimeOfDaySpeed());
39373937

3938-
block->heat = heat;
3939-
block->weather_update_time = gametime;
3938+
if(block) {
3939+
block->heat = heat;
3940+
block->weather_update_time = gametime;
3941+
}
39403942
return heat;
39413943
}
39423944

@@ -3954,8 +3956,10 @@ s16 ServerMap::updateBlockHumidity(ServerEnvironment *env, v3s16 p, MapBlock *bl
39543956
f32 humidity = m_emerge->biomedef->calcBlockHumidity(p, m_seed,
39553957
env->getTimeOfDayF(), gametime * env->getTimeOfDaySpeed());
39563958

3957-
block->humidity = humidity;
3958-
block->weather_update_time = gametime;
3959+
if(block) {
3960+
block->humidity = humidity;
3961+
block->weather_update_time = gametime;
3962+
}
39593963
return humidity;
39603964
}
39613965

0 commit comments

Comments
 (0)