From 32b954923a99edaf640ed258a1fce1f347f59883 Mon Sep 17 00:00:00 2001 From: Carbenium Date: Thu, 11 Jun 2015 13:07:54 +0200 Subject: Core/DBC: Fixed DBC fmt introduced in 2bd28bce696dfbed6e3e96acd37069f591f29fd4 * Improve invalid emblem color log message --- src/server/game/Guilds/Guild.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/server/game/Guilds/Guild.cpp') diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index d7448c50728..d4ba420d44d 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -680,12 +680,10 @@ void EmblemInfo::ReadPacket(WorldPackets::Guild::SaveGuildEmblem& packet) bool EmblemInfo::ValidateEmblemColors() { - if (sGuildColorBackgroundStore.LookupEntry(m_backgroundColor) && - sGuildColorBorderStore.LookupEntry(m_borderColor) && - sGuildColorEmblemStore.LookupEntry(m_color)) - return true; - - return false; + return sGuildColorBackgroundStore.LookupEntry(m_backgroundColor) && + sGuildColorBorderStore.LookupEntry(m_borderColor) && + sGuildColorEmblemStore.LookupEntry(m_color); + } bool EmblemInfo::LoadFromDB(Field* fields) @@ -2259,7 +2257,8 @@ bool Guild::LoadFromDB(Field* fields) if (!m_emblemInfo.LoadFromDB(fields)) { - TC_LOG_ERROR("guild", "Guild " UI64FMTD " has invalid emblem colors, skipped.", m_id); + TC_LOG_ERROR("guild", "Guild " UI64FMTD " has invalid emblem colors (Background: %u, Border: %u, Emblem: %u), skipped.", + m_id, m_emblemInfo.GetBackgroundColor(), m_emblemInfo.GetBorderColor(), m_emblemInfo.GetColor()); return false; } -- cgit v1.2.3