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 #616 from EraOSBeta/master

Browse Source 
Fixed PlayerSpaz using bs.apptime() instead of bs.time() for last_attacked_time
This commit is contained in:
Eric Froemling 2023-08-30 12:24:24 -07:00 committed by GitHub
commit fbfb3ac552
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS.md
View File

@ -41,9 +41,8 @@
- Modder - Modder
### Era0S ### Era0S
- Fixed a single bug - Bug Fixer
- Modder - Modder
- Made a SUPER important change
### VinniTR ### VinniTR
- Fixes - Fixes

6
src/assets/ba_data/python/bascenev1lib/actor/playerspaz.py
View File

@ -209,7 +209,7 @@ class PlayerSpaz(Spaz):
picked_up_by = msg.node.source_player picked_up_by = msg.node.source_player
if picked_up_by: if picked_up_by:
self.last_player_attacked_by = picked_up_by self.last_player_attacked_by = picked_up_by
self.last_attacked_time = bs.apptime() self.last_attacked_time = bs.time()
self.last_attacked_type = ('picked_up', 'default') self.last_attacked_type = ('picked_up', 'default')
elif isinstance(msg, bs.StandMessage): elif isinstance(msg, bs.StandMessage):
super().handlemessage(msg) # Augment standard behavior. super().handlemessage(msg) # Augment standard behavior.
@ -247,7 +247,7 @@ class PlayerSpaz(Spaz):
# something like last_actor_attacked_by to fix that. # something like last_actor_attacked_by to fix that.
if ( if (
self.last_player_attacked_by self.last_player_attacked_by
and bs.apptime() - self.last_attacked_time < 4.0 and bs.time() - self.last_attacked_time < 4.0
): ):
killerplayer = self.last_player_attacked_by killerplayer = self.last_player_attacked_by
else: else:
@ -278,7 +278,7 @@ class PlayerSpaz(Spaz):
source_player = msg.get_source_player(type(self._player)) source_player = msg.get_source_player(type(self._player))
if source_player: if source_player:
self.last_player_attacked_by = source_player self.last_player_attacked_by = source_player
self.last_attacked_time = bs.apptime() self.last_attacked_time = bs.time()
self.last_attacked_type = (msg.hit_type, msg.hit_subtype) self.last_attacked_type = (msg.hit_type, msg.hit_subtype)
super().handlemessage(msg) # Augment standard behavior. super().handlemessage(msg) # Augment standard behavior.
activity = self._activity() activity = self._activity()