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

yeah

Browse Source
This commit is contained in:
3alTemp 2024-03-03 22:11:20 -06:00
parent f8921c95f5
commit f30e8be399
No known key found for this signature in database
GPG Key ID: FC599A8DFAEC706C
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,11 +236,7 @@ class PlayerSpaz(Spaz):
and bs.time() - self.last_attacked_time < 4.0 and bs.time() - self.last_attacked_time < 4.0
) )
# Immediate-mode or left-game deaths don't count as 'kills'. # Immediate-mode or left-game deaths don't count as 'kills'.
<<<<<<< HEAD
killed = bool( killed = bool(
=======
killed = (
>>>>>>> 1a42c50052a4f63e119d13e5bdd05d3b71498bf3
not msg.immediate not msg.immediate
and msg.how is not bs.DeathType.LEFT_GAME and msg.how is not bs.DeathType.LEFT_GAME
or was_held or was_held