aboutsummaryrefslogtreecommitdiff
path: root/src/game/Spell.cpp
diff options
context:
space:
mode:
authorAstellar <none@none>2010-01-10 22:37:31 +0300
committerAstellar <none@none>2010-01-10 22:37:31 +0300
commit40f70a8594a687dd25212b8def1f49f61be95d7a (patch)
tree314afd621a3440cdac4e64867c9f355d7c2a9be0 /src/game/Spell.cpp
parentef24d90472d979697d234a54510320edcdc9ae61 (diff)
Fixed quest Catch and Release, some fixes for Tag Murloc spell.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
-rw-r--r--src/game/Spell.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 9e1f632ad33..76fa2922d19 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -5075,10 +5075,14 @@ SpellCastResult Spell::CheckCast(bool strict)
//custom check
switch(m_spellInfo->Id)
{
- case SPELL_TAG_MURLOC_30877:
- if (!m_targets.getUnitTarget() || (m_targets.getUnitTarget() && (m_targets.getUnitTarget()->HasAura(SPELL_TAG_MURLOC_30877) || m_targets.getUnitTarget()->GetTypeId() != TYPEID_UNIT || (m_targets.getUnitTarget()->GetTypeId() == TYPEID_UNIT && ((Creature*)m_targets.getUnitTarget())->GetEntry() != 17326 ))))// Tag Murloc, Blacksilt Scout
+ // Tag Murloc
+ case 30877:
+ {
+ Unit* target = m_targets.getUnitTarget();
+ if (!target || target->GetEntry() != 17326)
return SPELL_FAILED_BAD_TARGETS;
break;
+ }
case 61336:
if(m_caster->GetTypeId() != TYPEID_PLAYER || !((Player*)m_caster)->IsInFeralForm())
return SPELL_FAILED_ONLY_SHAPESHIFT;