public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-07 23:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix (Core/Quest) Correct link quest and fix command lookup quest for multilanguage dbc (#3271)

Browse Source 
Co-authored-by: Francesco Borzì <borzifrancesco@gmail.com>
Co-authored-by: Stefano Borzì <stefanoborzi32@gmail.com>
This commit is contained in:
r0m1ntik
2020-08-30 19:42:36 +02:00
committed by GitHub
parent 799ebb6a7d
commit 971d55d463
2 changed files with 74 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/Chat/ChatLink.cpp
View File

@@ -259,6 +259,14 @@ bool QuestChatLink::ValidateName(char* buffer, const char* context)
ChatLink::ValidateName(buffer, context); ChatLink::ValidateName(buffer, context);
bool res = (_quest->GetTitle() == buffer); bool res = (_quest->GetTitle() == buffer);
if (!res)
if (QuestLocale const* ql = sObjectMgr->GetQuestLocale(_quest->GetQuestId()))
for (uint8 i = 0; i < ql->Title.size(); i++)
if (ql->Title[i] == buffer)
{
res = true;
break;
}
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
if (!res) if (!res)

79
src/server/scripts/Commands/cs_lookup.cpp
View File

@@ -171,7 +171,7 @@ public:
if (creatureLocale->Name.size() > localeIndex && !creatureLocale->Name[localeIndex].empty()) if (creatureLocale->Name.size() > localeIndex && !creatureLocale->Name[localeIndex].empty())
{ {
std::string name = creatureLocale->Name[localeIndex]; std::string name = creatureLocale->Name[localeIndex];
if (Utf8FitTo(name, wNamePart)) if (Utf8FitTo(name, wNamePart))
{ {
if (maxResults && count++ == maxResults) if (maxResults && count++ == maxResults)
@@ -179,15 +179,15 @@ public:
handler->PSendSysMessage(LANG_COMMAND_LOOKUP_MAX_RESULTS, maxResults); handler->PSendSysMessage(LANG_COMMAND_LOOKUP_MAX_RESULTS, maxResults);
return true; return true;
} }
if (handler->GetSession()) if (handler->GetSession())
handler->PSendSysMessage(LANG_CREATURE_ENTRY_LIST_CHAT, id, id, name.c_str()); handler->PSendSysMessage(LANG_CREATURE_ENTRY_LIST_CHAT, id, id, name.c_str());
else else
handler->PSendSysMessage(LANG_CREATURE_ENTRY_LIST_CONSOLE, id, name.c_str()); handler->PSendSysMessage(LANG_CREATURE_ENTRY_LIST_CONSOLE, id, name.c_str());
if (!found) if (!found)
found = true; found = true;
continue; continue;
} }
} }
@@ -409,7 +409,7 @@ public:
if (il->Name.size() > ulocaleIndex && !il->Name[ulocaleIndex].empty()) if (il->Name.size() > ulocaleIndex && !il->Name[ulocaleIndex].empty())
{ {
std::string name = il->Name[ulocaleIndex]; std::string name = il->Name[ulocaleIndex];
if (Utf8FitTo(name, wNamePart)) if (Utf8FitTo(name, wNamePart))
{ {
if (maxResults && count++ == maxResults) if (maxResults && count++ == maxResults)
@@ -417,15 +417,15 @@ public:
handler->PSendSysMessage(LANG_COMMAND_LOOKUP_MAX_RESULTS, maxResults); handler->PSendSysMessage(LANG_COMMAND_LOOKUP_MAX_RESULTS, maxResults);
return true; return true;
} }
if (handler->GetSession()) if (handler->GetSession())
handler->PSendSysMessage(LANG_ITEM_LIST_CHAT, itr->second.ItemId, itr->second.ItemId, name.c_str()); handler->PSendSysMessage(LANG_ITEM_LIST_CHAT, itr->second.ItemId, itr->second.ItemId, name.c_str());
else else
handler->PSendSysMessage(LANG_ITEM_LIST_CONSOLE, itr->second.ItemId, name.c_str()); handler->PSendSysMessage(LANG_ITEM_LIST_CONSOLE, itr->second.ItemId, name.c_str());
if (!found) if (!found)
found = true; found = true;
continue; continue;
} }
} }
@@ -558,7 +558,7 @@ public:
if (objectLocalte->Name.size() > localeIndex && !objectLocalte->Name[localeIndex].empty()) if (objectLocalte->Name.size() > localeIndex && !objectLocalte->Name[localeIndex].empty())
{ {
std::string name = objectLocalte->Name[localeIndex]; std::string name = objectLocalte->Name[localeIndex];
if (Utf8FitTo(name, wNamePart)) if (Utf8FitTo(name, wNamePart))
{ {
if (maxResults && count++ == maxResults) if (maxResults && count++ == maxResults)
@@ -566,15 +566,15 @@ public:
handler->PSendSysMessage(LANG_COMMAND_LOOKUP_MAX_RESULTS, maxResults); handler->PSendSysMessage(LANG_COMMAND_LOOKUP_MAX_RESULTS, maxResults);
return true; return true;
} }
if (handler->GetSession()) if (handler->GetSession())
handler->PSendSysMessage(LANG_GO_ENTRY_LIST_CHAT, itr->second.entry, itr->second.entry, name.c_str()); handler->PSendSysMessage(LANG_GO_ENTRY_LIST_CHAT, itr->second.entry, itr->second.entry, name.c_str());
else else
handler->PSendSysMessage(LANG_GO_ENTRY_LIST_CONSOLE, itr->second.entry, name.c_str()); handler->PSendSysMessage(LANG_GO_ENTRY_LIST_CONSOLE, itr->second.entry, name.c_str());
if (!found) if (!found)
found = true; found = true;
continue; continue;
} }
} }
@@ -634,6 +634,59 @@ public:
{ {
Quest* qInfo = iter->second; Quest* qInfo = iter->second;
int localeIndex = handler->GetSessionDbLocaleIndex();
if (localeIndex >= 0)
{
uint8 ulocaleIndex = uint8(localeIndex);
if (QuestLocale const* questLocale = sObjectMgr->GetQuestLocale(qInfo->GetQuestId()))
{
if (questLocale->Title.size() > ulocaleIndex && !questLocale->Title[ulocaleIndex].empty())
{
std::string title = questLocale->Title[ulocaleIndex];
if (Utf8FitTo(title, wNamePart))
{
if (maxResults && count++ == maxResults)
{
handler->PSendSysMessage(LANG_COMMAND_LOOKUP_MAX_RESULTS, maxResults);
return true;
}
char const* statusStr = "";
if (target)
{
QuestStatus status = target->GetQuestStatus(qInfo->GetQuestId());
switch (status)
{
case QUEST_STATUS_COMPLETE:
statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_COMPLETE);
break;
case QUEST_STATUS_INCOMPLETE:
statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_ACTIVE);
break;
case QUEST_STATUS_REWARDED:
statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_REWARDED);
break;
default:
break;
}
}
if (handler->GetSession())
handler->PSendSysMessage(LANG_QUEST_LIST_CHAT, qInfo->GetQuestId(), qInfo->GetQuestId(), qInfo->GetQuestLevel(), title.c_str(), statusStr);
else
handler->PSendSysMessage(LANG_QUEST_LIST_CONSOLE, qInfo->GetQuestId(), title.c_str(), statusStr);
if (!found)
found = true;
continue;
}
}
}
}
std::string title = qInfo->GetTitle(); std::string title = qInfo->GetTitle();
if (title.empty()) if (title.empty())
continue; continue;
@@ -965,7 +1018,7 @@ public:
found = true; found = true;
} }
} }
if (!found) if (!found)
handler->SendSysMessage(LANG_COMMAND_NOSPELLFOUND); handler->SendSysMessage(LANG_COMMAND_NOSPELLFOUND);