Make sure spectators don't get caught in map

needs testing