Merge remote-tracking branch 'origin/ablu/bumblebeefix'

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 036bb45fb6dc48f029212faead961db052d00d12..c687c4502c33ae7c7ec9c8c69fc95559f6d2a788 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -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);