nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-01 10:03:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(Core/Global): Fix grouping of Worldserver initialization (#4130)

Browse Source
This commit is contained in:
Kitzunu
2021-01-25 20:50:53 +01:00
committed by GitHub
parent 49712bd12f
commit 879468506f
14 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/game/Addons/AddonMgr.cpp
View File

@@ -53,6 +53,7 @@ namespace AddonMgr
} while (result->NextRow());
sLog->outString(">> Loaded %u known addons in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
oldMSTime = getMSTime();
result = CharacterDatabase.Query("SELECT id, name, version, UNIX_TIMESTAMP(timestamp) FROM banned_addons");

2
src/server/game/Battlefield/BattlefieldMgr.cpp
View File

@@ -36,6 +36,7 @@ void BattlefieldMgr::InitBattlefield()
{
sLog->outString();
sLog->outString("Battlefield : Wintergrasp init failed.");
sLog->outString();
delete pBf;
}
else
@@ -43,6 +44,7 @@ void BattlefieldMgr::InitBattlefield()
m_BattlefieldSet.push_back(pBf);
sLog->outString();
sLog->outString("Battlefield : Wintergrasp successfully initiated.");
sLog->outString();
}
/* For Cataclysm: Tol Barad

1
src/server/game/Battlegrounds/BattlegroundMgr.cpp
View File

@@ -638,6 +638,7 @@ void BattlegroundMgr::CreateInitialBattlegrounds()
} while (result->NextRow());
sLog->outString(">> Loaded %u battlegrounds in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
void BattlegroundMgr::InitAutomaticArenaPointDistribution()

1
src/server/game/Calendar/CalendarMgr.cpp
View File

@@ -103,6 +103,7 @@ void CalendarMgr::LoadFromDB()
} while (result->NextRow());
sLog->outString(">> Loaded %u calendar invites", count);
sLog->outString();
for (uint64 i = 1; i < _maxEventId; ++i)
if (!GetEvent(i))

3
src/server/game/Chat/Channels/ChannelMgr.cpp
View File

@@ -43,7 +43,6 @@ void ChannelMgr::LoadChannels()
if (!result)
{
sLog->outString(">> Loaded 0 channels for %s", _teamId == TEAM_ALLIANCE ? "Alliance" : "Horde");
sLog->outString();
return;
}
@@ -136,8 +135,8 @@ void ChannelMgr::LoadChannelRights()
QueryResult result = CharacterDatabase.Query("SELECT name, flags, speakdelay, joinmessage, delaymessage, moderators FROM channels_rights");
if (!result)
{
sLog->outString();
sLog->outString(">> Loaded 0 Channel Rights!");
sLog->outString();
return;
}

2
src/server/game/DungeonFinding/LFGMgr.cpp
View File

@@ -193,6 +193,7 @@ namespace lfg
if (!result)
{
sLog->outError(">> Loaded 0 lfg entrance positions. DB table `lfg_dungeon_template` is empty!");
sLog->outString();
return;
}
@@ -219,6 +220,7 @@ namespace lfg
} while (result->NextRow());
sLog->outString(">> Loaded %u lfg entrance positions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
// Fill all other teleport coords from areatriggers
for (LFGDungeonContainer::iterator itr = LfgDungeonStore.begin(); itr != LfgDungeonStore.end(); ++itr)

1
src/server/game/Entities/Player/Player.cpp
View File

@@ -5165,6 +5165,7 @@ void Player::DeleteOldCharacters()
void Player::DeleteOldCharacters(uint32 keepDays)
{
sLog->outString("Player::DeleteOldChars: Deleting all characters which have been deleted %u days before...", keepDays);
sLog->outString();
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHAR_OLD_CHARS);
stmt->setUInt32(0, uint32(time(nullptr) - time_t(keepDays * DAY)));

10
src/server/game/Globals/ObjectMgr.cpp
View File

@@ -387,7 +387,7 @@ void ObjectMgr::LoadCreatureLocales()
AddLocaleString(Title, locale, data.Title);
} while (result->NextRow());
sLog->outString(">> Loaded %lu Сreature Locale strings in %u ms", (unsigned long)_creatureLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime));
sLog->outString(">> Loaded %lu Creature Locale strings in %u ms", (unsigned long)_creatureLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime));
}
void ObjectMgr::LoadGossipMenuItemsLocales()
@@ -591,6 +591,7 @@ void ObjectMgr::LoadCreatureTemplates()
}
sLog->outString(">> Loaded %u creature definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
void ObjectMgr::LoadCreatureTemplateAddons()
@@ -1699,6 +1700,7 @@ void ObjectMgr::LoadTempSummons()
} while (result->NextRow());
sLog->outString(">> Loaded %u temp summons in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
void ObjectMgr::LoadCreatures()
@@ -3339,6 +3341,7 @@ void ObjectMgr::LoadPlayerInfo()
} while (result->NextRow());
sLog->outString(">> Loaded %u player create definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
}
@@ -3472,6 +3475,7 @@ void ObjectMgr::LoadPlayerInfo()
} while (result->NextRow());
sLog->outString(">> Loaded %u player create spells in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
}
@@ -6981,6 +6985,7 @@ void ObjectMgr::LoadReputationRewardRate()
} while (result->NextRow());
sLog->outString(">> Loaded %u reputation_reward_rate in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
void ObjectMgr::LoadReputationOnKill()
@@ -8749,7 +8754,6 @@ void ObjectMgr::LoadBroadcastTexts()
} while (result->NextRow());
sLog->outString(">> Loaded " SZFMTD " broadcast texts in %u ms", _broadcastTextStore.size(), GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
void ObjectMgr::LoadBroadcastTextLocales()
@@ -9209,6 +9213,7 @@ void ObjectMgr::LoadGameObjectQuestItems()
} while (result->NextRow());
sLog->outString(">> Loaded %u gameobject quest items in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
void ObjectMgr::LoadCreatureQuestItems()
@@ -9238,4 +9243,5 @@ void ObjectMgr::LoadCreatureQuestItems()
} while (result->NextRow());
sLog->outString(">> Loaded %u creature quest items in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}

21
src/server/game/Guilds/GuildMgr.cpp
View File

@@ -36,7 +36,7 @@ uint32 GuildMgr::GenerateGuildId()
{
if (NextGuildId >= 0xFFFFFFFE)
{
sLog->outError("Guild ids overflow!! Can't continue, shutting down server. ");
sLog->outError("Guild ids overflow!! Can't continue, shutting down server.");
World::StopNow(ERROR_EXIT_CODE);
}
return NextGuildId++;
@@ -101,6 +101,7 @@ void GuildMgr::LoadGuilds()
if (!result)
{
sLog->outString(">> Loaded 0 guild definitions. DB table `guild` is empty.");
sLog->outString();
}
else
{
@@ -122,6 +123,7 @@ void GuildMgr::LoadGuilds()
} while (result->NextRow());
sLog->outString(">> Loaded %u guild definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
}
@@ -139,6 +141,7 @@ void GuildMgr::LoadGuilds()
if (!result)
{
sLog->outString(">> Loaded 0 guild ranks. DB table `guild_rank` is empty.");
sLog->outString();
}
else
{
@@ -155,6 +158,7 @@ void GuildMgr::LoadGuilds()
} while (result->NextRow());
sLog->outString(">> Loaded %u guild ranks in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
}
@@ -176,7 +180,10 @@ void GuildMgr::LoadGuilds()
"LEFT JOIN characters c ON c.guid = gm.guid ORDER BY guildid ASC");
if (!result)
{
sLog->outString(">> Loaded 0 guild members. DB table `guild_member` is empty.");
sLog->outString();
}
else
{
uint32 count = 0;
@@ -193,6 +200,7 @@ void GuildMgr::LoadGuilds()
} while (result->NextRow());
sLog->outString(">> Loaded %u guild members int %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
}
@@ -210,6 +218,7 @@ void GuildMgr::LoadGuilds()
if (!result)
{
sLog->outString(">> Loaded 0 guild bank tab rights. DB table `guild_bank_right` is empty.");
sLog->outString();
}
else
{
@@ -226,6 +235,7 @@ void GuildMgr::LoadGuilds()
} while (result->NextRow());
sLog->outString(">> Loaded %u bank tab rights in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
}
@@ -242,6 +252,7 @@ void GuildMgr::LoadGuilds()
if (!result)
{
sLog->outString(">> Loaded 0 guild event logs. DB table `guild_eventlog` is empty.");
sLog->outString();
}
else
{
@@ -258,6 +269,7 @@ void GuildMgr::LoadGuilds()
} while (result->NextRow());
sLog->outString(">> Loaded %u guild event logs in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
}
@@ -275,6 +287,7 @@ void GuildMgr::LoadGuilds()
if (!result)
{
sLog->outString(">> Loaded 0 guild bank event logs. DB table `guild_bank_eventlog` is empty.");
sLog->outString();
}
else
{
@@ -291,6 +304,7 @@ void GuildMgr::LoadGuilds()
} while (result->NextRow());
sLog->outString(">> Loaded %u guild bank event logs in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
}
@@ -308,6 +322,7 @@ void GuildMgr::LoadGuilds()
if (!result)
{
sLog->outString(">> Loaded 0 guild bank tabs. DB table `guild_bank_tab` is empty.");
sLog->outString();
}
else
{
@@ -324,6 +339,7 @@ void GuildMgr::LoadGuilds()
} while (result->NextRow());
sLog->outString(">> Loaded %u guild bank tabs in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
}
@@ -343,6 +359,7 @@ void GuildMgr::LoadGuilds()
if (!result)
{
sLog->outString(">> Loaded 0 guild bank tab items. DB table `guild_bank_item` or `item_instance` is empty.");
sLog->outString();
}
else
{
@@ -359,6 +376,7 @@ void GuildMgr::LoadGuilds()
} while (result->NextRow());
sLog->outString(">> Loaded %u guild bank tab items in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
}
@@ -376,6 +394,7 @@ void GuildMgr::LoadGuilds()
}
sLog->outString(">> Validated data of loaded guilds in %u ms", GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
}

2
src/server/game/Maps/TransportMgr.cpp
View File

@@ -80,6 +80,7 @@ void TransportMgr::LoadTransportTemplates()
} while (result->NextRow());
sLog->outString(">> Loaded %u transport templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
class SplineRawInitializer
@@ -432,6 +433,7 @@ void TransportMgr::SpawnContinentTransports()
}
sLog->outString(">> Spawned %u continent motion transports in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
if (sWorld->getBoolConfig(CONFIG_ENABLE_CONTINENT_TRANSPORT_PRELOADING))
{

1
src/server/game/Scripting/ScriptSystem.cpp
View File

@@ -74,5 +74,4 @@ void SystemMgr::LoadScriptWaypoints()
} while (result->NextRow());
sLog->outString(">> Loaded %u Script Waypoint nodes in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}

1
src/server/game/Spells/SpellMgr.cpp
View File

@@ -1770,6 +1770,7 @@ void SpellMgr::LoadSpellProcEvents()
} while (result->NextRow());
sLog->outString(">> Loaded %u extra spell proc event conditions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
void SpellMgr::LoadSpellProcs()

2
src/server/game/Tickets/TicketMgr.cpp
View File

@@ -319,6 +319,7 @@ void TicketMgr::LoadTickets()
} while (result->NextRow());
sLog->outString(">> Loaded %u GM tickets in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
void TicketMgr::LoadSurveys()
@@ -331,6 +332,7 @@ void TicketMgr::LoadSurveys()
_lastSurveyId = (*result)[0].GetUInt32();
sLog->outString(">> Loaded GM Survey count from database in %u ms", GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
void TicketMgr::AddTicket(GmTicket* ticket)

11
src/server/game/World/World.cpp
View File

@@ -1884,13 +1884,15 @@ void World::SetInitialWorldSettings()
AddonMgr::LoadFromDB();
// pussywizard:
sLog->outString("Deleting invalid mail items...\n");
sLog->outString("Deleting invalid mail items...");
sLog->outString();
CharacterDatabase.Query("DELETE mi FROM mail_items mi LEFT JOIN item_instance ii ON mi.item_guid = ii.guid WHERE ii.guid IS NULL");
CharacterDatabase.Query("DELETE mi FROM mail_items mi LEFT JOIN mail m ON mi.mail_id = m.id WHERE m.id IS NULL");
CharacterDatabase.Query("UPDATE mail m LEFT JOIN mail_items mi ON m.id = mi.mail_id SET m.has_items=0 WHERE m.has_items<>0 AND mi.mail_id IS NULL");
///- Handle outdated emails (delete/return)
sLog->outString("Returning old mails...");
sLog->outString();
sObjectMgr->ReturnOrDeleteOldMails(false);
///- Load AutoBroadCast
@@ -1924,10 +1926,12 @@ void World::SetInitialWorldSettings()
sCalendarMgr->LoadFromDB();
sLog->outString("Initializing SpellInfo precomputed data..."); // must be called after loading items, professions, spells and pretty much anything
sLog->outString();
sObjectMgr->InitializeSpellInfoPrecomputedData();
///- Initialize game time and timers
sLog->outString("Initialize game time and timers");
sLog->outString();
m_gameTime = time(nullptr);
m_startTime = m_gameTime;
@@ -1958,9 +1962,11 @@ void World::SetInitialWorldSettings()
///- Initialize MapManager
sLog->outString("Starting Map System");
sLog->outString();
sMapMgr->Initialize();
sLog->outString("Starting Game Event system...");
sLog->outString();
uint32 nextGameEvent = sGameEventMgr->StartSystem();
m_timers[WUPDATE_EVENTS].SetInterval(nextGameEvent); //depend on next event
@@ -1971,6 +1977,7 @@ void World::SetInitialWorldSettings()
Channel::CleanOldChannelsInDB();
sLog->outString("Starting Arena Season...");
sLog->outString();
sGameEventMgr->StartArenaSeason();
sTicketMgr->Initialize();
@@ -2017,6 +2024,7 @@ void World::SetInitialWorldSettings()
InitCalendarOldEventsDeletionTime();
sLog->outString("Calculate Guild cap reset time...");
sLog->outString();
InitGuildResetTime();
sLog->outString("Load Petitions...");
@@ -2159,6 +2167,7 @@ void World::LoadAutobroadcasts()
} while (result->NextRow());
sLog->outString(">> Loaded %u autobroadcast definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
/// Update the World !