From 1933f67d3d2efd5d6bd7c6dc05abbccca9427c00 Mon Sep 17 00:00:00 2001 From: Vishal Date: Sat, 2 Mar 2024 07:54:51 +0530 Subject: [PATCH] Fixing conflict --- src/assets/ba_data/python/bascenev1/_map.py | 2 +- .../ba_data/python/bauiv1lib/playlist/customizebrowser.py | 2 +- src/assets/ba_data/python/bauiv1lib/soundtrack/browser.py | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/assets/ba_data/python/bascenev1/_map.py b/src/assets/ba_data/python/bascenev1/_map.py index 42b22445..5ace08e2 100644 --- a/src/assets/ba_data/python/bascenev1/_map.py +++ b/src/assets/ba_data/python/bascenev1/_map.py @@ -334,7 +334,7 @@ class Map(Actor): closest_player_dist = 9999.0 for ppt in player_pts: dist = (ppt - testpt).length() - closest_player_dist = min(closest_player_dist, dist) + closest_player_dist = min(dist, closest_player_dist) if closest_player_dist > farthestpt_dist: farthestpt_dist = closest_player_dist farthestpt = testpt diff --git a/src/assets/ba_data/python/bauiv1lib/playlist/customizebrowser.py b/src/assets/ba_data/python/bauiv1lib/playlist/customizebrowser.py index 145a96eb..a2cdd9a0 100644 --- a/src/assets/ba_data/python/bauiv1lib/playlist/customizebrowser.py +++ b/src/assets/ba_data/python/bauiv1lib/playlist/customizebrowser.py @@ -538,7 +538,7 @@ class PlaylistCustomizeBrowserWindow(bui.Window): assert self._selected_playlist_index is not None self._selected_playlist_index = min( self._selected_playlist_index, - len(bui.app.config[self._pvars.config_name + ' Playlists']) + len(bui.app.config[self._pvars.config_name + ' Playlists']), ) self._refresh() diff --git a/src/assets/ba_data/python/bauiv1lib/soundtrack/browser.py b/src/assets/ba_data/python/bauiv1lib/soundtrack/browser.py index 04b57441..5907aa4b 100644 --- a/src/assets/ba_data/python/bauiv1lib/soundtrack/browser.py +++ b/src/assets/ba_data/python/bauiv1lib/soundtrack/browser.py @@ -287,8 +287,7 @@ class SoundtrackBrowserWindow(bui.Window): assert self._selected_soundtrack_index is not None assert self._soundtracks is not None self._selected_soundtrack_index = min( - self._selected_soundtrack_index, - len(self._soundtracks) + self._selected_soundtrack_index, len(self._soundtracks) ) self._refresh()