From 06d0b16f158e8793860d9edd11b990f20b1d0dac Mon Sep 17 00:00:00 2001 From: Meji Date: Mon, 29 May 2023 00:01:23 +0200 Subject: Core/Creatures: Move creature difficulty specific data from creature_template table to creature_template_difficulty (#28931) --- src/server/scripts/Commands/cs_npc.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/server/scripts/Commands') diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 75e622d8d88..96de137197b 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -523,7 +523,10 @@ public: handler->PSendSysMessage(LANG_NPCINFO_DYNAMIC_FLAGS, target->GetDynamicFlags()); handler->PSendSysMessage(LANG_COMMAND_RAWPAWNTIMES, defRespawnDelayStr.c_str(), curRespawnDelayStr.c_str()); - handler->PSendSysMessage(LANG_NPCINFO_LOOT, cInfo->lootid, cInfo->pickpocketLootId, cInfo->SkinLootId); + + CreatureDifficulty const* creatureDifficulty = target->GetCreatureDifficulty(); + handler->PSendSysMessage(LANG_NPCINFO_LOOT, creatureDifficulty->LootID, creatureDifficulty->PickPocketLootID, creatureDifficulty->SkinLootID); + handler->PSendSysMessage(LANG_NPCINFO_DUNGEON_ID, target->GetInstanceId()); if (CreatureData const* data = sObjectMgr->GetCreatureData(target->GetSpawnId())) @@ -1092,7 +1095,7 @@ public: CreatureTemplate const* cInfo = creatureTarget->GetCreatureTemplate(); - if (!cInfo->IsTameable (player->CanTameExoticPets())) + if (!cInfo->IsTameable (player->CanTameExoticPets(), creatureTarget->GetCreatureDifficulty())) { handler->PSendSysMessage (LANG_CREATURE_NON_TAMEABLE, cInfo->Entry); handler->SetSentErrorMessage (true); -- cgit v1.2.3