Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/ChatCommands: Parse SpellInfo also from enchant, glyph, talent and trade links (PR #25270)

Browse Source
This commit is contained in:
Peter Keresztes Schmidt
2020-08-17 18:26:41 +02:00
committed by GitHub
parent fa6a8e8f64
commit 9df61fd111
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/Chat/ChatCommands/ChatCommandArgs.cpp
View File

@@ -54,12 +54,20 @@ char const* Trinity::ChatCommands::ArgInfo<GameTele const*>::TryConsume(GameTele
struct SpellInfoVisitor
{
using value_type = SpellInfo const*;
value_type operator()(Hyperlink<enchant> enchant) const { return enchant; };
value_type operator()(Hyperlink<glyph> glyph) const { return operator()(glyph->Glyph->SpellID); };
value_type operator()(Hyperlink<spell> spell) const { return *spell; }
value_type operator()(Hyperlink<talent> talent) const
{
return operator()(talent->Talent->SpellRank[talent->Rank - 1]);
};
value_type operator()(Hyperlink<trade> trade) const { return trade->Spell; };
value_type operator()(uint32 spellId) const { return sSpellMgr->GetSpellInfo(spellId); }
};
char const* Trinity::ChatCommands::ArgInfo<SpellInfo const*>::TryConsume(SpellInfo const*& data, char const* args)
{
Variant<Hyperlink<spell>, uint32> val;
Variant<Hyperlink<enchant>, Hyperlink<glyph>, Hyperlink<spell>, Hyperlink<talent>, Hyperlink<trade>, uint32> val;
if ((args = CommandArgsConsumerSingle<decltype(val)>::TryConsumeTo(val, args)))
data = val.visit(SpellInfoVisitor());
return args;

2
src/server/game/Chat/HyperlinkTags.cpp
View File

@@ -125,7 +125,7 @@ bool Trinity::Hyperlinks::LinkTags::talent::StoreTo(TalentLinkData& val, char co
int8 rank; // talent links contain <learned rank>-1, we store <learned rank>
if (!(t.TryConsumeTo(talentId) && t.TryConsumeTo(rank) && t.IsEmpty()))
return false;
if (rank < -1 || rank > 4)
if (rank < -1 || rank >= MAX_TALENT_RANK)
return false;
val.Rank = rank+1;
if (!(val.Talent = sTalentStore.LookupEntry(talentId)))