mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-22 02:04:52 +01:00
Core/Chat: Fixed validating item links with random properties
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -63,7 +63,7 @@ namespace Trinity::Hyperlinks
|
||||
std::array<uint32, 3> GemEnchantId;
|
||||
ItemRandomPropertiesEntry const* RandomProperty;
|
||||
ItemRandomSuffixEntry const* RandomSuffix;
|
||||
uint32 RandomSuffixBaseAmount;
|
||||
uint32 PropertySeed;
|
||||
uint8 RenderLevel;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user