merge fix

src/mapblock.h

@@ -763,3 +763,7 @@ std::string analyze_block(MapBlock *block);
 using MapBlockPtr = std::shared_ptr<MapBlock>;
 // using MapBlockPtr = MapBlock *;
 
+inline std::string analyze_block(const MapBlockPtr &block)
+{
+	return analyze_block(block.get());
+};

src/servermap.cpp

@@ -374,7 +374,9 @@ void ServerMap::finishBlockMake(BlockMakeData *data,
 
 		/* Border blocks are grabbed during
 		   generation but mustn't be marked generated. */
-		if (bp >= bpmin && bp <= bpmax) {
+        if (bp.X >= bpmin.X && bp.X <= bpmax.X
+           				&& bp.Y >= bpmin.Y && bp.Y <= bpmax.Y
+           				&& bp.Z >= bpmin.Z && bp.Z <= bpmax.Z) {
 			block->setGenerated(true);
 			// Set timestamp to ensure correct application
 			// of LBMs and other stuff.