Fixed up map boundary checking as it previously relied on the old "collision" detection to handle the boundaries correctly (it was bugged and ended up falling back).