From fe9519f3b6c07eaf0e0bd8ea9076145cc2774036 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 18 Jul 2023 07:51:23 -0400 Subject: [PATCH] Core/Pets: Fixed crash when summoning hunter pets Port From (https://github.com/TrinityCore/TrinityCore/commit/074c5da6e43796a88ad34e8724362433d5109f88) --- Source/Game/Entities/Creature/Creature.cs | 2 +- Source/Game/Entities/Pet.cs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/Game/Entities/Creature/Creature.cs b/Source/Game/Entities/Creature/Creature.cs index 53a1baf36..ee47d7be4 100644 --- a/Source/Game/Entities/Creature/Creature.cs +++ b/Source/Game/Entities/Creature/Creature.cs @@ -220,7 +220,7 @@ namespace Game.Entities m_creatureInfo = creatureInfo; SetEntry(entry); - m_creatureDifficulty = creatureInfo.GetDifficulty(GetMap().GetDifficultyID()); + m_creatureDifficulty = creatureInfo.GetDifficulty(!IsPet() ? GetMap().GetDifficultyID() : Difficulty.None); // equal to player Race field, but creature does not have race SetRace(0); diff --git a/Source/Game/Entities/Pet.cs b/Source/Game/Entities/Pet.cs index d7a50a912..dea1074c8 100644 --- a/Source/Game/Entities/Pet.cs +++ b/Source/Game/Entities/Pet.cs @@ -162,7 +162,11 @@ namespace Game.Entities if (petInfo.Type == PetType.Hunter) { CreatureTemplate creatureInfo = Global.ObjectMgr.GetCreatureTemplate(petInfo.CreatureId); - if (creatureInfo == null || !creatureInfo.IsTameable(owner.CanTameExoticPets(), GetCreatureDifficulty())) + if (creatureInfo == null) + return false; + + CreatureDifficulty creatureDifficulty = creatureInfo.GetDifficulty(Difficulty.None); + if (creatureDifficulty == null || !creatureInfo.IsTameable(owner.CanTameExoticPets(), creatureDifficulty)) return false; }