Core/Chat: Fixed validating item links with random properties

This commit is contained in:
Shauren
2020-09-12 18:21:28 +02:00
parent abc6791846
commit 294167a7c8
2 changed files with 3 additions and 3 deletions

View File

@@ -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;

View File

@@ -63,7 +63,7 @@ namespace Trinity::Hyperlinks
std::array<uint32, 3> GemEnchantId;
ItemRandomPropertiesEntry const* RandomProperty;
ItemRandomSuffixEntry const* RandomSuffix;
uint32 RandomSuffixBaseAmount;
uint32 PropertySeed;
uint8 RenderLevel;
};