aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Spells/SpellInfo.cpp
diff options
context:
space:
mode:
authorDDuarte <dnpd.dd@gmail.com>2014-10-19 00:23:18 +0100
committerDDuarte <dnpd.dd@gmail.com>2014-10-19 00:23:18 +0100
commit98f98fa17fde4a1294b3e9227973ce5df70fbd6b (patch)
tree911710fb74f5b3665c8c88a0608969f2d9c2fbf4 /src/server/game/Spells/SpellInfo.cpp
parent8936723291985d1759a4903901c7a29cc54fdcbf (diff)
parenteb68b116271780f36d34e432cd6f2e9ad12d2b54 (diff)
Merge remote-tracking branch 'origin/4.3.4' into 6.x
Diffstat (limited to 'src/server/game/Spells/SpellInfo.cpp')
-rw-r--r--src/server/game/Spells/SpellInfo.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp
index 49e84d26d60..62d5763d6e2 100644
--- a/src/server/game/Spells/SpellInfo.cpp
+++ b/src/server/game/Spells/SpellInfo.cpp
@@ -1911,6 +1911,11 @@ bool SpellInfo::CheckTargetCreatureType(Unit const* target) const
else
return true;
}
+
+ // if target is magnet (i.e Grounding Totem) the check is skipped
+ if (target->IsMagnet())
+ return true;
+
uint32 creatureType = target->GetCreatureTypeMask();
return !TargetCreatureType || !creatureType || (creatureType & TargetCreatureType);
}