aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Spells/Spell.cpp
diff options
context:
space:
mode:
authorSubv <s.v.h21@hotmail.com>2012-04-08 16:22:19 -0500
committerSubv <s.v.h21@hotmail.com>2012-04-08 16:22:19 -0500
commit38d5fbac0ecbc380e9ebf49b3b09080c8e9e96f6 (patch)
treeb0ca584bea9b6f656f4773ff576b74826d678acc /src/server/game/Spells/Spell.cpp
parent268401029e1bc3fa0a052cb15d86123c5ecd1e6a (diff)
Core/Spells: You should be able to revive pets from anywhere without summoning them first
Closes #1090 Signed-off-by: Subv <s.v.h21@hotmail.com>
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
-rwxr-xr-xsrc/server/game/Spells/Spell.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index bc12f85b832..36d7328f37e 100755
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -5238,10 +5238,8 @@ SpellCastResult Spell::CheckCast(bool strict)
case SPELL_EFFECT_SUMMON_DEAD_PET:
{
Creature* pet = m_caster->GetGuardianPet();
- if (!pet)
- return SPELL_FAILED_NO_PET;
- if (pet->isAlive())
+ if (pet && pet->isAlive())
return SPELL_FAILED_ALREADY_HAVE_SUMMON;
break;
@@ -5291,7 +5289,6 @@ SpellCastResult Spell::CheckCast(bool strict)
if (m_caster->GetCharmGUID())
return SPELL_FAILED_ALREADY_HAVE_CHARM;
-
break;
}
case SPELL_EFFECT_SUMMON_PLAYER: