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

Latest public/internal sync.

Browse Source
This commit is contained in:
Eric 2024-05-19 17:22:56 -07:00
parent 9dc20b23a2
commit 252deff658
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/assets/ba_data/python/bascenev1lib/game/assault.py
View File

@ -249,12 +249,12 @@ class AssaultGame(bs.TeamGameActivity[Player, Team]):
# any sticky bomb's sticky material, if present and # any sticky bomb's sticky material, if present and
# is sticking to the players. # is sticking to the players.
self._teleport(player, new_pos, random_num) self._teleport(player, new_pos, random_num)
bs.timer(0.01, bs.Call( bs.timer(
self._teleport, 0.01,
player, bs.Call(
new_pos, self._teleport, player, new_pos, random_num
random_num ),
)) )
# Have teammates celebrate. # Have teammates celebrate.
for player in player_team.players: for player in player_team.players:
@ -267,13 +267,10 @@ class AssaultGame(bs.TeamGameActivity[Player, Team]):
self.end_game() self.end_game()
def _teleport( def _teleport(
self, self, client: Player, pos: Sequence[float], num: float
client: Player,
pos: Sequence[float],
num: float
) -> None: ) -> None:
if client.actor: if client.actor:
client.actor.handlemessage(bs.StandMessage(pos,num)) client.actor.handlemessage(bs.StandMessage(pos, num))
@override @override
def end_game(self) -> None: def end_game(self) -> None:

3
src/assets/ba_data/python/bauiv1lib/settings/plugins.py
View File

@ -389,8 +389,7 @@ class PluginWindow(bui.Window):
up_widget=self._back_button, up_widget=self._back_button,
left_widget=self._back_button, left_widget=self._back_button,
right_widget=( right_widget=(
self._settings_button if button is None else self._settings_button if button is None else button
button
), ),
) )
if button is not None: if button is not None: