Core/Creatures: Move creature difficulty specific data from creature_template table to creature_template_difficulty
Port From (https://github.com/TrinityCore/TrinityCore/commit/06d0b16f158e8793860d9edd11b990f20b1d0dac)
This commit is contained in:
@@ -124,7 +124,9 @@ namespace Game.Chat
|
||||
|
||||
handler.SendSysMessage(CypherStrings.NpcinfoDynamicFlags, target.GetDynamicFlags());
|
||||
handler.SendSysMessage(CypherStrings.CommandRawpawntimes, defRespawnDelayStr, curRespawnDelayStr);
|
||||
handler.SendSysMessage(CypherStrings.NpcinfoLoot, cInfo.LootId, cInfo.PickPocketId, cInfo.SkinLootId);
|
||||
|
||||
CreatureDifficulty creatureDifficulty = target.GetCreatureDifficulty();
|
||||
handler.SendSysMessage(CypherStrings.NpcinfoLoot, creatureDifficulty.LootID, creatureDifficulty.PickPocketLootID, creatureDifficulty.SkinLootID);
|
||||
handler.SendSysMessage(CypherStrings.NpcinfoDungeonId, target.GetInstanceId());
|
||||
|
||||
CreatureData data = Global.ObjectMgr.GetCreatureData(target.GetSpawnId());
|
||||
@@ -406,7 +408,7 @@ namespace Game.Chat
|
||||
|
||||
CreatureTemplate cInfo = creatureTarget.GetCreatureTemplate();
|
||||
|
||||
if (!cInfo.IsTameable(player.CanTameExoticPets()))
|
||||
if (!cInfo.IsTameable(player.CanTameExoticPets(), creatureTarget.GetCreatureDifficulty()))
|
||||
{
|
||||
handler.SendSysMessage(CypherStrings.CreatureNonTameable, cInfo.Entry);
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user