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

Merge pull request #654 from 3alTemp/meteor-fix

Browse Source 
Meteor Shower minigame end fix
This commit is contained in:
Eric Froemling 2024-03-01 17:41:10 -08:00 committed by GitHub
commit 51a9f39d0d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS.md
View File

@ -51,5 +51,8 @@
### Rikko ### Rikko
- Created the original "reject_recently_left_players" plugin - Created the original "reject_recently_left_players" plugin
### Temp (3alTemp)
- Modder & Bug Fixer
### brostos ### brostos
- Added support for joining using ipv6 address - Added support for joining using ipv6 address

6
src/assets/ba_data/python/bascenev1lib/game/meteorshower.py
View File

@ -73,6 +73,7 @@ class MeteorShowerGame(bs.TeamGameActivity[Player, Team]):
self._last_player_death_time: float | None = None self._last_player_death_time: float | None = None
self._meteor_time = 2.0 self._meteor_time = 2.0
self._timer: OnScreenTimer | None = None self._timer: OnScreenTimer | None = None
self._ended: bool = False
# Some base class overrides: # Some base class overrides:
self.default_music = ( self.default_music = (
@ -161,6 +162,10 @@ class MeteorShowerGame(bs.TeamGameActivity[Player, Team]):
return None return None
def _check_end_game(self) -> None: def _check_end_game(self) -> None:
# We don't want to end this activity more than once.
if self._ended:
return
living_team_count = 0 living_team_count = 0
for team in self.teams: for team in self.teams:
for player in team.players: for player in team.players:
@ -270,4 +275,5 @@ class MeteorShowerGame(bs.TeamGameActivity[Player, Team]):
# Submit the score value in milliseconds. # Submit the score value in milliseconds.
results.set_team_score(team, int(1000.0 * longest_life)) results.set_team_score(team, int(1000.0 * longest_life))
self._ended = True
self.end(results=results) self.end(results=results)