Core/Guild: Code Refactor
- Send correct events when modifiying Ranks (Add, modify, delete) - Store money/slots withdraw, not remaining slots. This will update remaining slots/money properly. - Reset daily slots/money withdraw for all members at same time, configurable - Better debug messages
This commit is contained in:
1 parent
3ee840a9be
commit
58ec4e5319
38 files changed
+1893
-1709
No files matched your search
@@ -18,10 +18,8 @@
|
||||
#include "Common.h"
|
||||
#include "GuildMgr.h"
|
||||
|
||||
GuildMgr::GuildMgr()
|
||||
{
|
||||
NextGuildId = 1;
|
||||
}
|
||||
GuildMgr::GuildMgr() : NextGuildId(1)
|
||||
{ }
|
||||
|
||||
GuildMgr::~GuildMgr()
|
||||
{
|
||||
@@ -121,6 +119,7 @@ void GuildMgr::LoadGuilds()
|
||||
delete guild;
|
||||
continue;
|
||||
}
|
||||
|
||||
AddGuild(guild);
|
||||
|
||||
++count;
|
||||
@@ -172,21 +171,18 @@ void GuildMgr::LoadGuilds()
|
||||
|
||||
// Delete orphaned guild member entries before loading the valid ones
|
||||
CharacterDatabase.DirectExecute("DELETE gm FROM guild_member gm LEFT JOIN guild g ON gm.guildId = g.guildId WHERE g.guildId IS NULL");
|
||||
CharacterDatabase.DirectExecute("DELETE gm FROM guild_member_withdraw gm LEFT JOIN guild_member g ON gm.guid = g.guid WHERE g.guid IS NULL");
|
||||
|
||||
// 0 1 2 3 4 5 6
|
||||
QueryResult result = CharacterDatabase.Query("SELECT guildid, gm.guid, rank, pnote, offnote, BankResetTimeMoney, BankRemMoney, "
|
||||
// 7 8 9 10 11 12
|
||||
"BankResetTimeTab0, BankRemSlotsTab0, BankResetTimeTab1, BankRemSlotsTab1, BankResetTimeTab2, BankRemSlotsTab2, "
|
||||
// 13 14 15 16 17 18
|
||||
"BankResetTimeTab3, BankRemSlotsTab3, BankResetTimeTab4, BankRemSlotsTab4, BankResetTimeTab5, BankRemSlotsTab5, "
|
||||
// 19 20 21 22 23 24
|
||||
"c.name, c.level, c.class, c.zone, c.account, c.logout_time "
|
||||
"FROM guild_member gm LEFT JOIN characters c ON c.guid = gm.guid ORDER BY guildid ASC");
|
||||
// 0 1 2 3 4 5 6 7 8 9 10
|
||||
QueryResult result = CharacterDatabase.Query("SELECT guildid, gm.guid, rank, pnote, offnote, w.tab0, w.tab1, w.tab2, w.tab3, w.tab4, w.tab5, "
|
||||
// 11 12 13 14 15 16 17
|
||||
"w.money, c.name, c.level, c.class, c.zone, c.account, c.logout_time "
|
||||
"FROM guild_member gm "
|
||||
"LEFT JOIN guild_member_withdraw w ON gm.guid = w.guid "
|
||||
"LEFT JOIN characters c ON c.guid = gm.guid ORDER BY guildid ASC");
|
||||
|
||||
if (!result)
|
||||
{
|
||||
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 guild members. DB table `guild_member` is empty.");
|
||||
}
|
||||
else
|
||||
{
|
||||
uint32 count = 0;
|
||||
@@ -215,7 +211,7 @@ void GuildMgr::LoadGuilds()
|
||||
// Delete orphaned guild bank right entries before loading the valid ones
|
||||
CharacterDatabase.DirectExecute("DELETE gbr FROM guild_bank_right gbr LEFT JOIN guild g ON gbr.guildId = g.guildId WHERE g.guildId IS NULL");
|
||||
|
||||
// 0 1 2 3 4
|
||||
// 0 1 2 3 4
|
||||
QueryResult result = CharacterDatabase.Query("SELECT guildid, TabId, rid, gbright, SlotPerDay FROM guild_bank_right ORDER BY guildid ASC, TabId ASC");
|
||||
|
||||
if (!result)
|
||||
@@ -382,20 +378,31 @@ void GuildMgr::LoadGuilds()
|
||||
sLog->outInfo(LOG_FILTER_GUILD, "Validating data of loaded guilds...");
|
||||
{
|
||||
uint32 oldMSTime = getMSTime();
|
||||
std::set<Guild*> rm; // temporary storage to avoid modifying GuildStore with RemoveGuild() while iterating
|
||||
|
||||
for (GuildContainer::iterator itr = GuildStore.begin(); itr != GuildStore.end(); ++itr)
|
||||
{
|
||||
Guild* guild = itr->second;
|
||||
if (guild)
|
||||
{
|
||||
if (!guild->Validate())
|
||||
{
|
||||
RemoveGuild(guild->GetId());
|
||||
delete guild;
|
||||
}
|
||||
}
|
||||
if (guild && !guild->Validate())
|
||||
rm.insert(guild);
|
||||
}
|
||||
|
||||
for (std::set<Guild*>::iterator itr = rm.begin(); itr != rm.end(); ++itr)
|
||||
{
|
||||
Guild* guild = *itr;
|
||||
RemoveGuild(guild->GetId());
|
||||
delete guild;
|
||||
}
|
||||
|
||||
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Validated data of loaded guilds in %u ms", GetMSTimeDiffToNow(oldMSTime));
|
||||
}
|
||||
}
|
||||
|
||||
void GuildMgr::ResetTimes()
|
||||
{
|
||||
for (GuildContainer::const_iterator itr = GuildStore.begin(); itr != GuildStore.end(); ++itr)
|
||||
if (Guild* guild = itr->second)
|
||||
guild->ResetTimes();
|
||||
|
||||
CharacterDatabase.DirectExecute("TRUNCATE guild_member_withdraw");
|
||||
}
|
||||
Reference in new issue
Block a user