RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-03 14:03:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing conflict

Browse Source
This commit is contained in:
Vishal 2024-03-02 07:54:51 +05:30 committed by GitHub
parent 4fefd20688
commit 1933f67d3d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/ba_data/python/bascenev1/_map.py
View File

@ -334,7 +334,7 @@ class Map(Actor):
closest_player_dist = 9999.0 closest_player_dist = 9999.0
for ppt in player_pts: for ppt in player_pts:
dist = (ppt - testpt).length() 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: if closest_player_dist > farthestpt_dist:
farthestpt_dist = closest_player_dist farthestpt_dist = closest_player_dist
farthestpt = testpt farthestpt = testpt

2
src/assets/ba_data/python/bauiv1lib/playlist/customizebrowser.py
View File

@ -538,7 +538,7 @@ class PlaylistCustomizeBrowserWindow(bui.Window):
assert self._selected_playlist_index is not None assert self._selected_playlist_index is not None
self._selected_playlist_index = min( self._selected_playlist_index = min(
self._selected_playlist_index, self._selected_playlist_index,
len(bui.app.config[self._pvars.config_name + ' Playlists']) len(bui.app.config[self._pvars.config_name + ' Playlists']),
) )
self._refresh() self._refresh()

3
src/assets/ba_data/python/bauiv1lib/soundtrack/browser.py
View File

@ -287,8 +287,7 @@ class SoundtrackBrowserWindow(bui.Window):
assert self._selected_soundtrack_index is not None assert self._selected_soundtrack_index is not None
assert self._soundtracks is not None assert self._soundtracks is not None
self._selected_soundtrack_index = min( self._selected_soundtrack_index = min(
self._selected_soundtrack_index, self._selected_soundtrack_index, len(self._soundtracks)
len(self._soundtracks)
) )
self._refresh() self._refresh()