h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-26 20:23:00 +08:00
Code Issues Releases Wiki Activity

Always compare OnlineIds by >0

Browse Source
This commit is contained in:
smoogipoo 2021-10-20 15:20:30 +09:00
parent ff2eae4597
commit c8cdc38efd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Models/RealmBeatmapSet.cs
View File

@ -63,7 +63,7 @@ namespace osu.Game.Models
if (IsManaged && other.IsManaged) if (IsManaged && other.IsManaged)
return ID == other.ID; return ID == other.ID;
if (OnlineID >= 0 && other.OnlineID >= 0) if (OnlineID > 0 && other.OnlineID > 0)
return OnlineID == other.OnlineID; return OnlineID == other.OnlineID;
if (!string.IsNullOrEmpty(Hash) && !string.IsNullOrEmpty(other.Hash)) if (!string.IsNullOrEmpty(Hash) && !string.IsNullOrEmpty(other.Hash))

8
osu.Game/Stores/BeatmapImporter.cs
View File

@ -74,7 +74,7 @@ namespace osu.Game.Stores
// ensure at least one beatmap was able to retrieve or keep an online ID, else drop the set ID. // ensure at least one beatmap was able to retrieve or keep an online ID, else drop the set ID.
if (hadOnlineBeatmapIDs && !beatmapSet.Beatmaps.Any(b => b.OnlineID > 0)) if (hadOnlineBeatmapIDs && !beatmapSet.Beatmaps.Any(b => b.OnlineID > 0))
{ {
if (beatmapSet.OnlineID > -1) if (beatmapSet.OnlineID > 0)
{ {
beatmapSet.OnlineID = -1; beatmapSet.OnlineID = -1;
LogForModel(beatmapSet, "Disassociating beatmap set ID due to loss of all beatmap IDs"); LogForModel(beatmapSet, "Disassociating beatmap set ID due to loss of all beatmap IDs");
@ -91,7 +91,7 @@ namespace osu.Game.Stores
// If this is ever an issue, we can consider marking as pending delete but not resetting the IDs (but care will be required for // If this is ever an issue, we can consider marking as pending delete but not resetting the IDs (but care will be required for
// beatmaps, which don't have their own `DeletePending` state). // beatmaps, which don't have their own `DeletePending` state).
if (beatmapSet.OnlineID > -1) if (beatmapSet.OnlineID > 0)
{ {
var existingSetWithSameOnlineID = realm.All<RealmBeatmapSet>().SingleOrDefault(b => b.OnlineID == beatmapSet.OnlineID); var existingSetWithSameOnlineID = realm.All<RealmBeatmapSet>().SingleOrDefault(b => b.OnlineID == beatmapSet.OnlineID);
@ -110,7 +110,7 @@ namespace osu.Game.Stores
private void validateOnlineIds(RealmBeatmapSet beatmapSet, Realm realm) private void validateOnlineIds(RealmBeatmapSet beatmapSet, Realm realm)
{ {
var beatmapIds = beatmapSet.Beatmaps.Where(b => b.OnlineID > -1).Select(b => b.OnlineID).ToList(); var beatmapIds = beatmapSet.Beatmaps.Where(b => b.OnlineID > 0).Select(b => b.OnlineID).ToList();
// ensure all IDs are unique // ensure all IDs are unique
if (beatmapIds.GroupBy(b => b).Any(g => g.Count() > 1)) if (beatmapIds.GroupBy(b => b).Any(g => g.Count() > 1))
@ -148,7 +148,7 @@ namespace osu.Game.Stores
if (!base.CanSkipImport(existing, import)) if (!base.CanSkipImport(existing, import))
return false; return false;
return existing.Beatmaps.Any(b => b.OnlineID > -1); return existing.Beatmaps.Any(b => b.OnlineID > 0);
} }
protected override bool CanReuseExisting(RealmBeatmapSet existing, RealmBeatmapSet import) protected override bool CanReuseExisting(RealmBeatmapSet existing, RealmBeatmapSet import)