yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-11-29 15:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: GetItemLink crash (#114)

Browse Source
This commit is contained in:
Axel Cocat
2023-04-02 21:44:38 +02:00
committed by GitHub
parent b946914dfd
commit 995ca165a9
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/LuaEngine/ItemMethods.h
View File

@@ -266,7 +266,9 @@ namespace LuaItem
const ItemTemplate* temp = item->GetTemplate(); const ItemTemplate* temp = item->GetTemplate();
std::string name = temp->Name1; std::string name = temp->Name1;
if (ItemLocale const* il = eObjectMgr->GetItemLocale(temp->ItemId)) if (ItemLocale const* il = eObjectMgr->GetItemLocale(temp->ItemId))
{
ObjectMgr::GetLocaleString(il->Name, static_cast<LocaleConstant>(locale), name); ObjectMgr::GetLocaleString(il->Name, static_cast<LocaleConstant>(locale), name);
}
#ifndef CLASSIC #ifndef CLASSIC
if (int32 itemRandPropId = item->GetItemRandomPropertyId()) if (int32 itemRandPropId = item->GetItemRandomPropertyId())
@@ -284,34 +286,43 @@ namespace LuaItem
{ {
const ItemRandomSuffixEntry* itemRandEntry = sItemRandomSuffixStore.LookupEntry(-item->GetItemRandomPropertyId()); const ItemRandomSuffixEntry* itemRandEntry = sItemRandomSuffixStore.LookupEntry(-item->GetItemRandomPropertyId());
if (itemRandEntry) if (itemRandEntry)
{
#if TRINITY || AZEROTHCORE #if TRINITY || AZEROTHCORE
suffix = &itemRandEntry->Name; suffix = &itemRandEntry->Name;
#else #else
suffix = itemRandEntry->nameSuffix; suffix = itemRandEntry->nameSuffix;
#endif #endif
} }
}
else else
{ {
const ItemRandomPropertiesEntry* itemRandEntry = sItemRandomPropertiesStore.LookupEntry(item->GetItemRandomPropertyId()); const ItemRandomPropertiesEntry* itemRandEntry = sItemRandomPropertiesStore.LookupEntry(item->GetItemRandomPropertyId());
if (itemRandEntry) if (itemRandEntry)
{
#if TRINITY || AZEROTHCORE #if TRINITY || AZEROTHCORE
suffix = &itemRandEntry->Name; suffix = &itemRandEntry->Name;
#else #else
suffix = itemRandEntry->nameSuffix; suffix = itemRandEntry->nameSuffix;
#endif #endif
} }
}
if (suffix) if (suffix)
{ {
name += ' ';
#if TRINITY || AZEROTHCORE #if TRINITY || AZEROTHCORE
name += (*suffix)[(name != temp->Name1) ? locale : uint8(DEFAULT_LOCALE)]; const char* suffixName = (*suffix)[(name != temp->Name1) ? locale : uint8(DEFAULT_LOCALE)];
#else #else
name += suffix[(name != temp->Name1) ? locale : uint8(DEFAULT_LOCALE)]; const char* suffixName = suffix[(name != temp->Name1) ? locale : uint8(DEFAULT_LOCALE)];
#endif #endif
if (strcmp(suffixName, "") != 0)
{
name += ' ';
name += suffixName;
}
} }
} }
#endif #endif
Player* owner = item->GetOwner();
std::ostringstream oss; std::ostringstream oss;
oss << "|c" << std::hex << ItemQualityColors[temp->Quality] << std::dec << oss << "|c" << std::hex << ItemQualityColors[temp->Quality] << std::dec <<
"|Hitem:" << temp->ItemId << ":" << "|Hitem:" << temp->ItemId << ":" <<
@@ -323,11 +334,7 @@ namespace LuaItem
item->GetEnchantmentId(BONUS_ENCHANTMENT_SLOT) << ":" << item->GetEnchantmentId(BONUS_ENCHANTMENT_SLOT) << ":" <<
#endif #endif
item->GetItemRandomPropertyId() << ":" << item->GetItemSuffixFactor() << ":" << item->GetItemRandomPropertyId() << ":" << item->GetItemSuffixFactor() << ":" <<
#ifdef TRINITY (uint32)(owner ? owner->GetLevel() : 0) << "|h[" << name << "]|h|r";
(uint32)item->GetOwner()->GetLevel() << "|h[" << name << "]|h|r";
#else
(uint32)item->GetOwner()->getLevel() << "|h[" << name << "]|h|r";
#endif
Eluna::Push(L, oss.str()); Eluna::Push(L, oss.str());
return 1; return 1;