diff --git a/Source/Data/Achievement.cs b/Source/Data/Achievement.cs index 15fa9675..e3f6bc5d 100644 --- a/Source/Data/Achievement.cs +++ b/Source/Data/Achievement.cs @@ -110,13 +110,10 @@ public static Achievement FindMergeAchievement(IEnumerable achievem return match; } - // ignore achievements with non-local IDs. they're only eligible for matching by ID. - var localAchievements = achievements.Where(a => a.Id == 0 || a.Id >= FirstLocalId); - // second pass - look for title match if (!String.IsNullOrEmpty(achievement.Title)) { - match = localAchievements.FirstOrDefault(a => String.Compare(a.Title, achievement.Title, StringComparison.InvariantCultureIgnoreCase) == 0); + match = achievements.FirstOrDefault(a => String.Compare(a.Title, achievement.Title, StringComparison.InvariantCultureIgnoreCase) == 0); if (match != null) return match; } @@ -124,7 +121,7 @@ public static Achievement FindMergeAchievement(IEnumerable achievem // third pass - look for description match if (!String.IsNullOrEmpty(achievement.Description)) { - match = localAchievements.FirstOrDefault(a => String.Compare(a.Description, achievement.Description, StringComparison.InvariantCultureIgnoreCase) == 0); + match = achievements.FirstOrDefault(a => String.Compare(a.Description, achievement.Description, StringComparison.InvariantCultureIgnoreCase) == 0); if (match != null) return match; } diff --git a/Source/Data/Leaderboard.cs b/Source/Data/Leaderboard.cs index 01d3128c..11544a64 100644 --- a/Source/Data/Leaderboard.cs +++ b/Source/Data/Leaderboard.cs @@ -200,13 +200,10 @@ public static Leaderboard FindMergeLeaderboard(IEnumerable leaderbo return match; } - // ignore leaderboards with non-local IDs. they're only eligible for matching by ID. - var localLeaderboards = leaderboards.Where(a => a.Id == 0 || a.Id >= FirstLocalId); - // second pass - look for title match if (!String.IsNullOrEmpty(leaderboard.Title)) { - match = localLeaderboards.FirstOrDefault(l => String.Compare(l.Title, leaderboard.Title, StringComparison.InvariantCultureIgnoreCase) == 0); + match = leaderboards.FirstOrDefault(l => String.Compare(l.Title, leaderboard.Title, StringComparison.InvariantCultureIgnoreCase) == 0); if (match != null) return match; } @@ -214,7 +211,7 @@ public static Leaderboard FindMergeLeaderboard(IEnumerable leaderbo // third pass - look for description match if (!String.IsNullOrEmpty(leaderboard.Description)) { - match = localLeaderboards.FirstOrDefault(l => String.Compare(l.Description, leaderboard.Description, StringComparison.InvariantCultureIgnoreCase) == 0); + match = leaderboards.FirstOrDefault(l => String.Compare(l.Description, leaderboard.Description, StringComparison.InvariantCultureIgnoreCase) == 0); if (match != null) return match; }