From b30831038502b1cbbed4cebc910a0e2bf7c65635 Mon Sep 17 00:00:00 2001
From: Ensiform <ensiform@gmail.com>
Date: Sat, 4 Nov 2017 12:13:11 -0500
Subject: [PATCH] SP game: Fixed bug introduced in 5c8a2d7

Rage force power no longer acted like undying due to a typo in this commit
---
 code/game/g_combat.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/g_combat.cpp b/code/game/g_combat.cpp
index 2bea30525a..6378aee1cd 100644
--- a/code/game/g_combat.cpp
+++ b/code/game/g_combat.cpp
@@ -6451,7 +6451,7 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, const
 		((targ->flags&FL_UNDYING) ||
 			(dflags&DAMAGE_NO_KILL) ||
 			((targ->client) &&
-				(targ->client->ps.forcePowersActive & (1 << FP_RAGE)) &
+				(targ->client->ps.forcePowersActive & (1 << FP_RAGE)) &&
 				!(dflags&DAMAGE_NO_PROTECTION) &&
 				!(dflags&DAMAGE_DIE_ON_IMPACT))));