refactor(Core): Clean (#22583)

This commit is contained in:
天鹭
2025-07-29 20:11:25 +08:00
committed by GitHub
parent 57dacae38b
commit 0abb998529
8 changed files with 58 additions and 58 deletions

View File

@@ -217,10 +217,10 @@ void World::LoadConfigSettings(bool reload)
//visibility on continents
_maxVisibleDistanceOnContinents = sConfigMgr->GetOption<float>("Visibility.Distance.Continents", DEFAULT_VISIBILITY_DISTANCE);
if (_maxVisibleDistanceOnContinents < 45 * sWorld->getRate(RATE_CREATURE_AGGRO))
if (_maxVisibleDistanceOnContinents < 45 * getRate(RATE_CREATURE_AGGRO))
{
LOG_ERROR("server.loading", "Visibility.Distance.Continents can't be less max aggro radius {}", 45 * sWorld->getRate(RATE_CREATURE_AGGRO));
_maxVisibleDistanceOnContinents = 45 * sWorld->getRate(RATE_CREATURE_AGGRO);
LOG_ERROR("server.loading", "Visibility.Distance.Continents can't be less max aggro radius {}", 45 * getRate(RATE_CREATURE_AGGRO));
_maxVisibleDistanceOnContinents = 45 * getRate(RATE_CREATURE_AGGRO);
}
else if (_maxVisibleDistanceOnContinents > MAX_VISIBILITY_DISTANCE)
{
@@ -230,10 +230,10 @@ void World::LoadConfigSettings(bool reload)
//visibility in instances
_maxVisibleDistanceInInstances = sConfigMgr->GetOption<float>("Visibility.Distance.Instances", DEFAULT_VISIBILITY_INSTANCE);
if (_maxVisibleDistanceInInstances < 45 * sWorld->getRate(RATE_CREATURE_AGGRO))
if (_maxVisibleDistanceInInstances < 45 * getRate(RATE_CREATURE_AGGRO))
{
LOG_ERROR("server.loading", "Visibility.Distance.Instances can't be less max aggro radius {}", 45 * sWorld->getRate(RATE_CREATURE_AGGRO));
_maxVisibleDistanceInInstances = 45 * sWorld->getRate(RATE_CREATURE_AGGRO);
LOG_ERROR("server.loading", "Visibility.Distance.Instances can't be less max aggro radius {}", 45 * getRate(RATE_CREATURE_AGGRO));
_maxVisibleDistanceInInstances = 45 * getRate(RATE_CREATURE_AGGRO);
}
else if (_maxVisibleDistanceInInstances > MAX_VISIBILITY_DISTANCE)
{
@@ -243,10 +243,10 @@ void World::LoadConfigSettings(bool reload)
//visibility in BG/Arenas
_maxVisibleDistanceInBGArenas = sConfigMgr->GetOption<float>("Visibility.Distance.BGArenas", DEFAULT_VISIBILITY_BGARENAS);
if (_maxVisibleDistanceInBGArenas < 45 * sWorld->getRate(RATE_CREATURE_AGGRO))
if (_maxVisibleDistanceInBGArenas < 45 * getRate(RATE_CREATURE_AGGRO))
{
LOG_ERROR("server.loading", "Visibility.Distance.BGArenas can't be less max aggro radius {}", 45 * sWorld->getRate(RATE_CREATURE_AGGRO));
_maxVisibleDistanceInBGArenas = 45 * sWorld->getRate(RATE_CREATURE_AGGRO);
LOG_ERROR("server.loading", "Visibility.Distance.BGArenas can't be less max aggro radius {}", 45 * getRate(RATE_CREATURE_AGGRO));
_maxVisibleDistanceInBGArenas = 45 * getRate(RATE_CREATURE_AGGRO);
}
else if (_maxVisibleDistanceInBGArenas > MAX_VISIBILITY_DISTANCE)
{
@@ -1000,7 +1000,7 @@ void World::SetInitialWorldSettings()
sScriptMgr->OnBeforeWorldInitialized();
if (sWorld->getBoolConfig(CONFIG_PRELOAD_ALL_NON_INSTANCED_MAP_GRIDS))
if (getBoolConfig(CONFIG_PRELOAD_ALL_NON_INSTANCED_MAP_GRIDS))
{
LOG_INFO("server.loading", "Loading All Grids For All Non-Instanced Maps...");
@@ -1196,7 +1196,7 @@ void World::Update(uint32 diff)
}
/// <li> Clean logs table
if (sWorld->getIntConfig(CONFIG_LOGDB_CLEARTIME) > 0) // if not enabled, ignore the timer
if (getIntConfig(CONFIG_LOGDB_CLEARTIME) > 0) // if not enabled, ignore the timer
{
if (_timers[WUPDATE_CLEANDB].Passed())
{
@@ -1205,7 +1205,7 @@ void World::Update(uint32 diff)
_timers[WUPDATE_CLEANDB].Reset();
LoginDatabasePreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_DEL_OLD_LOGS);
stmt->SetData(0, sWorld->getIntConfig(CONFIG_LOGDB_CLEARTIME));
stmt->SetData(0, getIntConfig(CONFIG_LOGDB_CLEARTIME));
stmt->SetData(1, uint32(currentGameTime.count()));
LoginDatabase.Execute(stmt);
}
@@ -1222,7 +1222,7 @@ void World::Update(uint32 diff)
sMapMgr->Update(diff);
}
if (sWorld->getBoolConfig(CONFIG_AUTOBROADCAST))
if (getBoolConfig(CONFIG_AUTOBROADCAST))
{
if (_timers[WUPDATE_AUTOBROADCAST].Passed())
{