summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-09-01 23:37:41 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-09-01 23:37:41 +0200
commit79a9c8cf1c3d80a9211b29e452bad225a1717f90 (patch)
treec66a9d96a2573b8261bcc7838a22fad4655b66b4
parentAdded a Player parameter to OnUpdatedSign and OnUpdatingSign Lua callbacks and to the cWorld:UpdateSign method (http://forum.mc-server.org/showthread.php?tid=464&pid=4393#pid4393) (diff)
downloadcuberite-79a9c8cf1c3d80a9211b29e452bad225a1717f90.tar
cuberite-79a9c8cf1c3d80a9211b29e452bad225a1717f90.tar.gz
cuberite-79a9c8cf1c3d80a9211b29e452bad225a1717f90.tar.bz2
cuberite-79a9c8cf1c3d80a9211b29e452bad225a1717f90.tar.lz
cuberite-79a9c8cf1c3d80a9211b29e452bad225a1717f90.tar.xz
cuberite-79a9c8cf1c3d80a9211b29e452bad225a1717f90.tar.zst
cuberite-79a9c8cf1c3d80a9211b29e452bad225a1717f90.zip
-rw-r--r--source/cChunkGenerator.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/cChunkGenerator.cpp b/source/cChunkGenerator.cpp
index 6b87550de..be2544541 100644
--- a/source/cChunkGenerator.cpp
+++ b/source/cChunkGenerator.cpp
@@ -405,7 +405,10 @@ void cChunkGenerator::QueueGenerateChunk(int a_ChunkX, int a_ChunkY, int a_Chunk
void cChunkGenerator::GenerateBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap)
{
- m_BiomeGen->GenBiomes(a_ChunkX, a_ChunkZ, a_BiomeMap);
+ if (m_BiomeGen != NULL) // Quick fix for generator deinitializing before the world storage finishes loading
+ {
+ m_BiomeGen->GenBiomes(a_ChunkX, a_ChunkZ, a_BiomeMap);
+ }
}