Fixed a server crash

Fixes #3665 Thanks to @laziem, @nubspixel, @teededung and @Badarosk0
rathena · Jan 9, 2019 · 7eed88c · 7eed88c
1 parent 8ae788b
commit 7eed88c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/map/map.cpp b/src/map/map.cpp
@@ -744,6 +744,11 @@ int map_foreachinareaV(int(*func)(struct block_list*, va_list), int16 m, int16 x
 
 	struct map_data *mapdata = map_getmapdata(m);
 
+	// Required for delayed monster removal in instances
+	if( mapdata == nullptr || mapdata->block == nullptr ){
+		return 0;
+	}
+
 	x0 = i16max(x0, 0);
 	y0 = i16max(y0, 0);
 	x1 = i16min(x1, mapdata->xs - 1);