[12895] Fix logic for [12891]

Thanks to @evil-at-wow
cmangos · Jul 9, 2015 · 2fa51c8 · 2fa51c8
1 parent 26eeb6a
commit 2fa51c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
@@ -1360,7 +1360,7 @@ void Unit::CalculateSpellDamage(SpellNonMeleeDamage* damageInfo, int32 damage, S
         return;
 
     // units which are not alive cannot deal damage except for dying creatures
-    if ((!this->isAlive() || !pVictim->isAlive()) && (this->GetTypeId() != TYPEID_UNIT && this->getDeathState() != DEAD))
+    if ((!this->isAlive() || !pVictim->isAlive()) && (this->GetTypeId() != TYPEID_UNIT || this->getDeathState() != DEAD))
         return;
 
     // Check spell crit chance

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12894"
+ #define REVISION_NR "12895"
 #endif // __REVISION_NR_H__