projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dd6b513
)
Don't play any pain sound when hitting a frozen player (it happened while revive...
author
terencehill <piuntn@gmail.com>
Tue, 26 Feb 2019 17:11:16 +0000
(18:11 +0100)
committer
terencehill <piuntn@gmail.com>
Tue, 26 Feb 2019 17:26:50 +0000
(18:26 +0100)
qcsrc/server/player.qc
patch
|
blob
|
history
diff --git
a/qcsrc/server/player.qc
b/qcsrc/server/player.qc
index b8d3c903c541cab860c1f596bf118037d534d017..81c63f21cd6ac3b7d6084181b3cdc1033459abdc 100644
(file)
--- a/
qcsrc/server/player.qc
+++ b/
qcsrc/server/player.qc
@@
-412,7
+412,8
@@
void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
if (take > 100)
Violence_GibSplash_At(hitloc, force * -0.2, 3, 1, this, attacker);
- if (time >= this.spawnshieldtime || autocvar_g_spawnshield_blockdamage < 1)
+ if ((time >= this.spawnshieldtime || autocvar_g_spawnshield_blockdamage < 1)
+ && !STAT(FROZEN, this))
{
if (!(this.flags & FL_GODMODE))
{