aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2016-11-29 03:45:05 -0300
committerariel- <ariel-@users.noreply.github.com>2016-11-29 03:45:05 -0300
commit0f649d51e94794bbd3b54d9e83a2cc1fa09f4bbe (patch)
tree5fc0923f8e95769f8fbc387f768df7ea7ef521c9 /src
parentb049caf62fff5c8196a1ccc4ac4e825a97660eab (diff)
Core/Scripts: fix a failed assertion crash in Master's Call script
Closes #18316 Closes #18318
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/Spells/spell_hunter.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp
index b341c5799ed..59e01eb4fd6 100644
--- a/src/server/scripts/Spells/spell_hunter.cpp
+++ b/src/server/scripts/Spells/spell_hunter.cpp
@@ -752,11 +752,11 @@ class spell_hun_masters_call : public SpellScriptLoader
SpellCastResult DoCheckCast()
{
- Pet* pet = GetCaster()->ToPlayer()->GetPet();
+ Guardian* pet = GetCaster()->ToPlayer()->GetGuardianPet();
ASSERT(pet); // checked in Spell::CheckCast
- if (!pet->IsAlive())
- return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW;
+ if (!pet->IsPet() || !pet->IsAlive())
+ return SPELL_FAILED_NO_PET;
// Do a mini Spell::CheckCasterAuras on the pet, no other way of doing this
SpellCastResult result = SPELL_CAST_OK;