Merge remote-tracking branch 'origin/ablu/bumblebeefix'
authorSamual Lenks <samual@xonotic.org>
Sat, 15 Jun 2013 06:18:08 +0000 (02:18 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 15 Jun 2013 06:18:08 +0000 (02:18 -0400)
qcsrc/server/cl_client.qc

index 036bb45..c687c45 100644 (file)
@@ -1418,7 +1418,7 @@ void player_powerups (void)
 
        self.effects &~= (EF_RED | EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT | EF_FLAME | EF_NODEPTHTEST);
 
-       if(self.alpha < 0 || self.deadflag) // don't apply the flags if the player is gibbed
+       if((self.alpha < 0 || self.deadflag) && !self.vehicle) // don't apply the flags if the player is gibbed
                return;
 
        Fire_ApplyDamage(self);