Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Pets: Fixed crash when summoning hunter pets

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/074c5da6e43796a88ad34e8724362433d5109f88)
This commit is contained in:
hondacrx
2023-07-18 07:51:23 -04:00
parent e4111c7d22
commit fe9519f3b6
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Creature/Creature.cs
+1 -1
View File
@@ -220,7 +220,7 @@ namespace Game.Entities
m_creatureInfo = creatureInfo; m_creatureInfo = creatureInfo;
SetEntry(entry); 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 // equal to player Race field, but creature does not have race
SetRace(0); SetRace(0);
Source/Game/Entities/Pet.cs
+5 -1
View File
@@ -162,7 +162,11 @@ namespace Game.Entities
if (petInfo.Type == PetType.Hunter) if (petInfo.Type == PetType.Hunter)
{ {
CreatureTemplate creatureInfo = Global.ObjectMgr.GetCreatureTemplate(petInfo.CreatureId); 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; return false;
} }