projects
/
xonotic
/
xonotic-data.pk3dir.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into TimePath/modules
[xonotic/xonotic-data.pk3dir.git]
/
qcsrc
/
common
/
mutators
/
mutator
/
spawn_near_teammate
/
sv_spawn_near_teammate.qc
diff --git
a/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc
b/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc
index 4c57d018950d4445e061924bfa4c000b3a962ddf..fb14f27db8063cb22d96b1dd9baad197b2f545d2 100644
(file)
--- a/
qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc
+++ b/
qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc
@@
-88,6
+88,7
@@
MUTATOR_HOOKFUNCTION(spawn_near_teammate, PlayerSpawn)
if(it.msnt_timer < time)
if(SAME_TEAM(player, it))
if(time > it.spawnshieldtime) // spawn shielding
+ if(!forbidWeaponUse(it))
if(STAT(FROZEN, it) == 0)
if(it != player)
{