1 files changed, 4 insertions, 12 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index a347b921..1abb9780 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -871,12 +871,8 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
   int     asave = 0;
   int     knockback;
 
-  if( !targ->takedamage )
-    return;
-
-  // the intermission has allready been qualified for, so don't
-  // allow any extra scoring
-  if( level.intermissionQueued )
+  // Can't deal damage sometimes
+  if( !targ->takedamage || targ->health <= 0 || level.intermissionQueued )
     return;
 
   if( !inflictor )
@@ -896,12 +892,8 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
   }
 
   client = targ->client;
-
-  if( client )
-  {
-    if( client->noclip )
-      return;
-  }
+  if( client && client->noclip )
+    return;
 
   if( !dir )
     dflags |= DAMAGE_NO_KNOCKBACK;