Fix explosions trying to write to unread blockarea

cuberite · Apr 26, 2015 · b10336ad64aedaa85d7a48c4e578b1f4628693c3 · b10336a
1 parent 27413bc
commit b10336ad64aedaa85d7a48c4e578b1f4628693c3
Unified Split

Showing with 5 additions and 3 deletions.

+5 −3 src/ChunkMap.cpp
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
@@ -1880,10 +1880,12 @@ void cChunkMap::DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_
 	if (ShouldDestroyBlocks)
 	{
 		cBlockArea area;
-
 		a_BlocksAffected.reserve(8 * ExplosionSizeInt * ExplosionSizeInt * ExplosionSizeInt);
-
-		area.Read(m_World, bx - ExplosionSizeInt, (int)ceil(a_BlockX + ExplosionSizeInt), MinY, MaxY, bz - ExplosionSizeInt, (int)ceil(a_BlockZ + ExplosionSizeInt));
+		if (!area.Read(m_World, bx - ExplosionSizeInt, (int)ceil(a_BlockX + ExplosionSizeInt), MinY, MaxY, bz - ExplosionSizeInt, (int)ceil(a_BlockZ + ExplosionSizeInt)))
+		{
+			return;
+		}
+		
 		for (int x = -ExplosionSizeInt; x < ExplosionSizeInt; x++)
 		{
 			for (int y = -ExplosionSizeInt; y < ExplosionSizeInt; y++)