Merge "Fix bug in calculating perspective damage"