From 2d70df1ff6b080edc0b950fb3f95f630437aac0b Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Fri, 22 Jun 2018 17:43:52 +0200 Subject: [PATCH] Core/Spells: added more taming failure result handlings to Tame Beast script --- src/server/scripts/Spells/spell_hunter.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 2e63dcc6df3..3844ab13a58 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -1127,6 +1127,9 @@ class spell_hun_tame_beast : public SpellScriptLoader PetTameFailureReason reason = PET_TAME_FAILURE_UNKNOWN; + if (player->getClass() != CLASS_HUNTER) + return SendTameFailResult(PET_TAME_FAILURE_CANNOT_TAME_CREATURES); + if (!player->GetFirstUnusedActivePetSlot()) return SendTameFailResult(PET_TAME_FAILURE_TOO_MANY_PETS); @@ -1148,6 +1151,8 @@ class spell_hun_tame_beast : public SpellScriptLoader if (player->GetCharmGUID()) return SendTameFailResult(PET_TAME_FAILURE_CREATURE_CONTROLLED); } + else + return SendTameFailResult(PET_TAME_FAILURE_NOT_TAMEABLE); return SPELL_CAST_OK; }