aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorQAston <qaston@gmail.com>2011-08-20 10:23:28 +0200
committerQAston <qaston@gmail.com>2011-08-20 10:23:28 +0200
commit511db662978dbd267f964e987a08737e57750e5d (patch)
tree977787cf3ebbe0b11c85f0e42d9a1ba1f8efa3fc /src
parentb0602b3153bc4c0e43bd8255f22c121e002cbe5d (diff)
Core/Spells: Remove some duplicate checks from Spell::CheckPetCast
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Spells/Spell.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 9ec814b8eaf..51cd83e08a2 100755
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -5434,13 +5434,8 @@ SpellCastResult Spell::CheckCast(bool strict)
SpellCastResult Spell::CheckPetCast(Unit* target)
{
- if (!m_caster->isAlive() && !(m_spellInfo->Attributes & SPELL_ATTR0_CASTABLE_WHILE_DEAD))
- return SPELL_FAILED_CASTER_DEAD;
-
if (m_caster->HasUnitState(UNIT_STAT_CASTING) && !(_triggeredCastFlags & TRIGGERED_IGNORE_CAST_IN_PROGRESS)) //prevent spellcast interruption by another spellcast
return SPELL_FAILED_SPELL_IN_PROGRESS;
- if (m_caster->isInCombat() && !m_spellInfo->CanBeUsedInCombat())
- return SPELL_FAILED_AFFECTING_COMBAT;
// dead owner (pets still alive when owners ressed?)
if (Unit *owner = m_caster->GetCharmerOrOwner())
@@ -5467,9 +5462,6 @@ SpellCastResult Spell::CheckPetCast(Unit* target)
// for target dead/target not valid
if (_target)
{
- if (!_target->isAlive())
- return SPELL_FAILED_BAD_TARGETS;
-
if (!IsValidSingleTargetSpell(_target))
return SPELL_FAILED_BAD_TARGETS;
}