From e5f3432b7d711823830f298ec0301db3f33f7021 Mon Sep 17 00:00:00 2001
From: ranmd9a <ranmd9a@abox3.so-net.ne.jp>
Date: Sun, 15 Aug 2021 18:36:52 +0900
Subject: [PATCH] Fixed an issue where invalid songs in the playlist would be
 counted twice as an error.

---
 src/libraries/playlist/loader/deserializer/JsonDeserializer.ts  | 2 +-
 .../deserializer/helper/PlaylistDeserializeBeatsaverBeatmap.ts  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libraries/playlist/loader/deserializer/JsonDeserializer.ts b/src/libraries/playlist/loader/deserializer/JsonDeserializer.ts
index 09f154a2..b327b939 100644
--- a/src/libraries/playlist/loader/deserializer/JsonDeserializer.ts
+++ b/src/libraries/playlist/loader/deserializer/JsonDeserializer.ts
@@ -68,7 +68,7 @@ export default class JsonDeserializer extends PlaylistDeserializer {
     for (const song of songs) {
       if (song.hash != null) {
         const beatmap = BeatmapLibrary.GetAllValidMap().find(
-          (value) => value.hash === song.hash
+          (value) => value.hash?.toUpperCase() === song.hash?.toUpperCase()
         );
         if (beatmap == null) {
           newSongs.push(song);
diff --git a/src/libraries/playlist/loader/deserializer/helper/PlaylistDeserializeBeatsaverBeatmap.ts b/src/libraries/playlist/loader/deserializer/helper/PlaylistDeserializeBeatsaverBeatmap.ts
index bc3bdec9..ec30d9a9 100644
--- a/src/libraries/playlist/loader/deserializer/helper/PlaylistDeserializeBeatsaverBeatmap.ts
+++ b/src/libraries/playlist/loader/deserializer/helper/PlaylistDeserializeBeatsaverBeatmap.ts
@@ -48,6 +48,8 @@ export default class PlaylistDeserializeBeatsaverBeatmap {
         progress.plusOne();
         result.push(newItem);
         // return newItem;
+        // eslint-disable-next-line no-continue
+        continue;
       }
       progress.plusOne();
       // return item;