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

exceptions cleanup and fix ffa spawn

Browse Source
This commit is contained in:
Roman Trapeznikov 2020-05-21 17:05:57 +03:00
parent 5a7bcf4e44
commit 5c6249d8c9
No known key found for this signature in database
GPG Key ID: 827DD41DACE1E018
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
assets/src/ba_data/python/ba/_activity.py
View File

@ -166,14 +166,14 @@ class Activity(DependencyComponent, Generic[PlayerType, TeamType]):
session = _ba.getsession() session = _ba.getsession()
if session is None: if session is None:
raise Exception('No current session') raise RuntimeError('No current session')
self._session = weakref.ref(session) self._session = weakref.ref(session)
# Preloaded data for actors, maps, etc; indexed by type. # Preloaded data for actors, maps, etc; indexed by type.
self.preloads: Dict[Type, Any] = {} self.preloads: Dict[Type, Any] = {}
if not isinstance(settings, dict): if not isinstance(settings, dict):
raise Exception('expected dict for settings') raise TypeError('expected dict for settings')
if _ba.getactivity(doraise=False) is not self: if _ba.getactivity(doraise=False) is not self:
raise Exception('invalid context state') raise Exception('invalid context state')
@ -292,8 +292,8 @@ class Activity(DependencyComponent, Generic[PlayerType, TeamType]):
(internal) (internal)
""" """
if self.has_begun(): if self.has_begun():
raise Exception('This should only be called for Activities' raise RuntimeError('This should only be called for Activities'
'that have not yet begun.') 'that have not yet begun.')
if not self._should_end_immediately or force: if not self._should_end_immediately or force:
self._should_end_immediately = True self._should_end_immediately = True
self._should_end_immediately_results = results self._should_end_immediately_results = results
@ -340,7 +340,7 @@ class Activity(DependencyComponent, Generic[PlayerType, TeamType]):
""" """
from ba import _actor as bsactor from ba import _actor as bsactor
if not isinstance(actor, bsactor.Actor): if not isinstance(actor, bsactor.Actor):
raise Exception('non-actor passed to _retain_actor') raise TypeError('non-actor passed to retain_actor')
if (self.has_transitioned_in() if (self.has_transitioned_in()
and _ba.time() - self._last_prune_dead_actors_time > 10.0): and _ba.time() - self._last_prune_dead_actors_time > 10.0):
print_error('it looks like nodes/actors are not' print_error('it looks like nodes/actors are not'
@ -356,7 +356,7 @@ class Activity(DependencyComponent, Generic[PlayerType, TeamType]):
""" """
from ba import _actor as bsactor from ba import _actor as bsactor
if not isinstance(actor, bsactor.Actor): if not isinstance(actor, bsactor.Actor):
raise Exception('non-actor passed to _add_actor_weak_ref') raise TypeError('non-actor passed to add_actor_weak_ref')
if (self.has_transitioned_in() if (self.has_transitioned_in()
and _ba.time() - self._last_prune_dead_actors_time > 10.0): and _ba.time() - self._last_prune_dead_actors_time > 10.0):
print_error('it looks like nodes/actors are ' print_error('it looks like nodes/actors are '

2
assets/src/ba_data/python/ba/_gameactivity.py
View File

@ -965,7 +965,7 @@ class GameActivity(Activity[PlayerType, TeamType]):
The default implementation simply calls spawn_player_spaz(). The default implementation simply calls spawn_player_spaz().
""" """
if not player: if not player:
raise Exception('spawn_player() called for nonexistent player') raise TypeError('spawn_player() called for nonexistent player')
return self.spawn_player_spaz(player) return self.spawn_player_spaz(player)

7
assets/src/ba_data/python/ba/_map.py
View File

@ -365,11 +365,12 @@ class Map(Actor):
player_pts = [] player_pts = []
for player in players: for player in players:
try: try:
if player.node: if player and player.node:
pnt = _ba.Vec3(player.node.position) pnt = _ba.Vec3(player.node.position)
player_pts.append(pnt) player_pts.append(pnt)
except Exception as exc: except Exception:
print('EXC in get_ffa_start_position:', exc) from ba import _error
_error.print_exception()
def _getpt() -> Sequence[float]: def _getpt() -> Sequence[float]:
point = self.ffa_spawn_points[self._next_ffa_start_index] point = self.ffa_spawn_points[self._next_ffa_start_index]