diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-09-12 18:21:28 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-09-12 18:21:28 +0200 |
| commit | 294167a7c89bacfdb759c320f240efe4d322fadb (patch) | |
| tree | 186e844a0a438054943b28f35b343c8951f94eb1 /src | |
| parent | abc679184625ced4667780d65507c85df72b5ad5 (diff) | |
Core/Chat: Fixed validating item links with random properties
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Chat/HyperlinkTags.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Chat/Hyperlinks.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Chat/HyperlinkTags.cpp b/src/server/game/Chat/HyperlinkTags.cpp index d42de7f879b..b00a2acdd69 100644 --- a/src/server/game/Chat/HyperlinkTags.cpp +++ b/src/server/game/Chat/HyperlinkTags.cpp @@ -116,7 +116,7 @@ bool Trinity::Hyperlinks::LinkTags::item::StoreTo(ItemLinkData& val, std::string int randomPropertyId; if (!(val.Item && t.TryConsumeTo(val.EnchantId) && t.TryConsumeTo(val.GemEnchantId[0]) && t.TryConsumeTo(val.GemEnchantId[1]) && - t.TryConsumeTo(val.GemEnchantId[2]) && t.TryConsumeTo(dummy) && t.TryConsumeTo(randomPropertyId) && t.TryConsumeTo(val.RandomSuffixBaseAmount) && + t.TryConsumeTo(val.GemEnchantId[2]) && t.TryConsumeTo(dummy) && t.TryConsumeTo(val.PropertySeed) && t.TryConsumeTo(randomPropertyId) && t.TryConsumeTo(val.RenderLevel) && t.IsEmpty() && !dummy)) return false; @@ -150,7 +150,7 @@ bool Trinity::Hyperlinks::LinkTags::item::StoreTo(ItemLinkData& val, std::string val.RandomProperty = nullptr; } - if ((val.RandomSuffix && !val.RandomSuffixBaseAmount) || (val.RandomSuffixBaseAmount && !val.RandomSuffix)) + if ((val.RandomSuffix && !val.PropertySeed) || (val.PropertySeed && !val.RandomSuffix)) return false; return true; diff --git a/src/server/game/Chat/Hyperlinks.h b/src/server/game/Chat/Hyperlinks.h index 83bb77be567..773576ce4ec 100644 --- a/src/server/game/Chat/Hyperlinks.h +++ b/src/server/game/Chat/Hyperlinks.h @@ -63,7 +63,7 @@ namespace Trinity::Hyperlinks std::array<uint32, 3> GemEnchantId; ItemRandomPropertiesEntry const* RandomProperty; ItemRandomSuffixEntry const* RandomSuffix; - uint32 RandomSuffixBaseAmount; + uint32 PropertySeed; uint8 RenderLevel; }; |