Core: Update to 10.2.0

This commit is contained in:
Shauren
2023-11-09 13:33:26 +01:00
parent f58ff3d0f7
commit 1eea1d11b1
61 changed files with 2015 additions and 1343 deletions

View File

@@ -738,12 +738,11 @@ void EmblemInfo::ReadPacket(WorldPackets::Guild::SaveGuildEmblem& packet)
m_backgroundColor = packet.Bg;
}
bool EmblemInfo::ValidateEmblemColors() const
bool EmblemInfo::ValidateEmblemColors(uint32 /*style*/, uint32 color, uint32 /*borderStyle*/, uint32 borderColor, uint32 backgroundColor)
{
return sGuildColorBackgroundStore.LookupEntry(m_backgroundColor) &&
sGuildColorBorderStore.LookupEntry(m_borderColor) &&
sGuildColorEmblemStore.LookupEntry(m_color);
return sGuildColorBackgroundStore.LookupEntry(backgroundColor) &&
sGuildColorBorderStore.LookupEntry(borderColor) &&
sGuildColorEmblemStore.LookupEntry(color);
}
bool EmblemInfo::LoadFromDB(Field* fields)