From 9fe4f221cfadd152e4f8e8364fd8077e8e2a375e Mon Sep 17 00:00:00 2001 From: Justus Lind Date: Thu, 21 Nov 2024 00:10:10 +1000 Subject: [PATCH 1/3] Change missing attribute error to key error. --- worlds/musedash/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worlds/musedash/__init__.py b/worlds/musedash/__init__.py index ab3a4819fc48..be2eec2f87b8 100644 --- a/worlds/musedash/__init__.py +++ b/worlds/musedash/__init__.py @@ -183,7 +183,7 @@ def create_item(self, name: str) -> Item: if album: return MuseDashSongItem(name, self.player, album) - song = self.md_collection.song_items.get(name) + song = self.md_collection.song_items[name] return MuseDashSongItem(name, self.player, song) def get_filler_item_name(self) -> str: From 719255891e543d15720b6bdeb293621266618efc Mon Sep 17 00:00:00 2001 From: Justus Lind Date: Thu, 21 Nov 2024 00:20:35 +1000 Subject: [PATCH 2/3] Swap to explicit key error --- worlds/musedash/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/worlds/musedash/__init__.py b/worlds/musedash/__init__.py index be2eec2f87b8..734616ab4041 100644 --- a/worlds/musedash/__init__.py +++ b/worlds/musedash/__init__.py @@ -183,8 +183,10 @@ def create_item(self, name: str) -> Item: if album: return MuseDashSongItem(name, self.player, album) - song = self.md_collection.song_items[name] - return MuseDashSongItem(name, self.player, song) + song = self.md_collection.song_items.get(name) + if song: + return MuseDashSongItem(name, self.player, song) + raise KeyError(name) def get_filler_item_name(self) -> str: return self.random.choices(self.filler_item_names, self.filler_item_weights)[0] From 8ee8bee44b41be59520c8dbe937af6a9d190c01b Mon Sep 17 00:00:00 2001 From: Justus Lind Date: Sun, 24 Nov 2024 12:25:03 +1000 Subject: [PATCH 3/3] Revert "Swap to explicit key error" This reverts commit 719255891e543d15720b6bdeb293621266618efc. --- worlds/musedash/__init__.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/worlds/musedash/__init__.py b/worlds/musedash/__init__.py index 734616ab4041..be2eec2f87b8 100644 --- a/worlds/musedash/__init__.py +++ b/worlds/musedash/__init__.py @@ -183,10 +183,8 @@ def create_item(self, name: str) -> Item: if album: return MuseDashSongItem(name, self.player, album) - song = self.md_collection.song_items.get(name) - if song: - return MuseDashSongItem(name, self.player, song) - raise KeyError(name) + song = self.md_collection.song_items[name] + return MuseDashSongItem(name, self.player, song) def get_filler_item_name(self) -> str: return self.random.choices(self.filler_item_names, self.filler_item_weights)[0]