summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/game')
-rw-r--r--src/game/g_weapon.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index e5130a43..cadaab49 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -725,12 +725,19 @@ void CheckGrabAttack( gentity_t *ent )
if( !traceEnt->takedamage )
return;
+
if( !traceEnt->client )
return;
+
if( traceEnt->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS )
return;
+
if( traceEnt->client->ps.stats[ STAT_HEALTH ] <= 0 )
return;
+
+ //can't grab a player with the battlesuit
+ if( BG_gotItem( UP_BATTLESUIT, traceEnt->client->ps.stats ) )
+ return;
if( !( traceEnt->client->ps.stats[ STAT_STATE ] & SS_GRABBED ) )
{