From e082e29bcc9a7698b78e0de975752be03b769eb8 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Sat, 31 Jul 2010 22:42:49 +0400 Subject: [PATCH] [10301] Init guild create date at create in same value in memory and DB. --- src/game/Guild.cpp | 7 ++++--- src/game/GuildHandler.cpp | 1 - src/shared/revision_nr.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/game/Guild.cpp b/src/game/Guild.cpp index 4582a0159..70a088b24 100644 --- a/src/game/Guild.cpp +++ b/src/game/Guild.cpp @@ -42,7 +42,7 @@ Guild::Guild() m_BackgroundColor = 0; m_accountsNumber = 0; - m_CreatedDate = time(0); + m_CreatedDate = 0; m_GuildBankMoney = 0; @@ -72,6 +72,7 @@ bool Guild::Create(Player* leader, std::string gname) MOTD = "No message set."; m_GuildBankMoney = 0; m_Id = sObjectMgr.GenerateGuildId(); + m_CreatedDate = time(0); DEBUG_LOG("GUILD: creating guild %s to leader: %u", gname.c_str(), GUID_LOPART(m_LeaderGuid)); @@ -87,8 +88,8 @@ bool Guild::Create(Player* leader, std::string gname) // CharacterDatabase.PExecute("DELETE FROM guild WHERE guildid='%u'", Id); - MAX(guildid)+1 not exist CharacterDatabase.PExecute("DELETE FROM guild_member WHERE guildid='%u'", m_Id); CharacterDatabase.PExecute("INSERT INTO guild (guildid,name,leaderguid,info,motd,createdate,EmblemStyle,EmblemColor,BorderStyle,BorderColor,BackgroundColor,BankMoney) " - "VALUES('%u','%s','%u', '%s', '%s', UNIX_TIMESTAMP(NOW()),'%u','%u','%u','%u','%u','" UI64FMTD "')", - m_Id, gname.c_str(), GUID_LOPART(m_LeaderGuid), dbGINFO.c_str(), dbMOTD.c_str(), m_EmblemStyle, m_EmblemColor, m_BorderStyle, m_BorderColor, m_BackgroundColor, m_GuildBankMoney); + "VALUES('%u','%s','%u', '%s', '%s','" UI64FMTD "','%u','%u','%u','%u','%u','" UI64FMTD "')", + m_Id, gname.c_str(), GUID_LOPART(m_LeaderGuid), dbGINFO.c_str(), dbMOTD.c_str(), uint64(m_CreatedDate), m_EmblemStyle, m_EmblemColor, m_BorderStyle, m_BorderColor, m_BackgroundColor, m_GuildBankMoney); CharacterDatabase.CommitTransaction(); CreateDefaultGuildRanks(lSession->GetSessionDbLocaleIndex()); diff --git a/src/game/GuildHandler.cpp b/src/game/GuildHandler.cpp index 3e66764c0..bb47fcd15 100644 --- a/src/game/GuildHandler.cpp +++ b/src/game/GuildHandler.cpp @@ -231,7 +231,6 @@ void WorldSession::HandleGuildInfoOpcode(WorldPacket& /*recvPacket*/) data << uint32(secsToTimeBitFields(guild->GetCreatedDate())); // 3.x (prev. day + month + year) data << uint32(guild->GetMemberSize()); // amount of chars data << uint32(guild->GetAccountsNumber()); // amount of accounts - SendPacket(&data); } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 62d63cc85..96b1b60e7 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10300" + #define REVISION_NR "10301" #endif // __REVISION_NR_H__