China and Malaysia are trying to patch things up, but an armed kidnapping at a dive resort won’t help