mirror of
https://github.com/RYDE-WORK/ballistica.git
synced 2026-01-27 09:23:12 +08:00
yeah
This commit is contained in:
parent
f8921c95f5
commit
f30e8be399
@ -236,11 +236,7 @@ class PlayerSpaz(Spaz):
|
||||
and bs.time() - self.last_attacked_time < 4.0
|
||||
)
|
||||
# Immediate-mode or left-game deaths don't count as 'kills'.
|
||||
<<<<<<< HEAD
|
||||
killed = bool(
|
||||
=======
|
||||
killed = (
|
||||
>>>>>>> 1a42c50052a4f63e119d13e5bdd05d3b71498bf3
|
||||
not msg.immediate
|
||||
and msg.how is not bs.DeathType.LEFT_GAME
|
||||
or was_held
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user