From 26a3fb92b1c73608b8a3010e0fbff8247f022e65 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 10 Mar 2022 09:41:42 -0500 Subject: [PATCH] Core/Spells: Fix summoning SUMMON_PET type pets Port From (https://github.com/TrinityCore/TrinityCore/commit/48d491ae2ffbebc05aae46cad2c012a4e983fb11) --- Source/Game/Spells/Spell.cs | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/Source/Game/Spells/Spell.cs b/Source/Game/Spells/Spell.cs index 5a95397bb..ec884237e 100644 --- a/Source/Game/Spells/Spell.cs +++ b/Source/Game/Spells/Spell.cs @@ -5228,22 +5228,25 @@ namespace Game.Spells return SpellCastResult.DontReport; } - if (info.Item1.Type == PetType.Hunter && info.Item1.Health == 0) + if (info.Item1.Type == PetType.Hunter) { - playerCaster.SendTameFailure(PetTameResult.Dead); - return SpellCastResult.DontReport; - } + if (info.Item1.Health == 0) + { + playerCaster.SendTameFailure(PetTameResult.Dead); + return SpellCastResult.DontReport; + } - CreatureTemplate creatureInfo = Global.ObjectMgr.GetCreatureTemplate(info.Item1.CreatureId); - if (creatureInfo == null || !creatureInfo.IsTameable(playerCaster.CanTameExoticPets())) - { - // if problem in exotic pet - if (creatureInfo != null && creatureInfo.IsTameable(true)) - playerCaster.SendTameFailure(PetTameResult.CantControlExotic); - else - playerCaster.SendTameFailure(PetTameResult.NoPetAvailable); + CreatureTemplate creatureInfo = Global.ObjectMgr.GetCreatureTemplate(info.Item1.CreatureId); + if (creatureInfo == null || !creatureInfo.IsTameable(playerCaster.CanTameExoticPets())) + { + // if problem in exotic pet + if (creatureInfo != null && creatureInfo.IsTameable(true)) + playerCaster.SendTameFailure(PetTameResult.CantControlExotic); + else + playerCaster.SendTameFailure(PetTameResult.NoPetAvailable); - return SpellCastResult.DontReport; + return SpellCastResult.DontReport; + } } } break;