diff options
| author | Machiavelli <machiavelli.trinity@gmail.com> | 2011-12-10 15:21:55 +0100 |
|---|---|---|
| committer | Machiavelli <machiavelli.trinity@gmail.com> | 2011-12-10 15:21:55 +0100 |
| commit | b1c8226d58ecdda9a9af5b4e3e8d88c1d44f589f (patch) | |
| tree | ed9d70ffb03d5a85fd8abe4ea618a20a5b297635 /src/server/game/Spells/SpellEffects.cpp | |
| parent | fe69bd654a424f560f37774d5c3e763fd6589607 (diff) | |
| parent | 11fb0beaf0cb877b14f24aa88f19832e0aa3dc88 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
| -rwxr-xr-x | src/server/game/Spells/SpellEffects.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 55e71fe42d1..e6812eb8b27 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -6378,14 +6378,15 @@ void Spell::EffectSummonDeadPet(SpellEffIndex /*effIndex*/) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT) return; - if (m_caster->GetTypeId() != TYPEID_PLAYER) + Player* _player = m_caster->ToPlayer() + + if (!_player) return; - Player* _player = m_caster->ToPlayer(); + Pet* pet = _player->GetPet(); - if (!pet) - return; - if (pet->isAlive()) + if (!pet || pet->isAlive()) return; + if (damage < 0) return; |