diff options
| -rw-r--r-- | src/server/game/World/World.cpp | 9 | ||||
| -rw-r--r-- | src/server/game/World/World.h | 1 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 8 |
3 files changed, 17 insertions, 1 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 020d6eb5627..9262ec58840 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1088,6 +1088,12 @@ void World::LoadConfigSettings(bool reload) m_int_configs[CONFIG_GROUP_VISIBILITY] = sConfigMgr->GetIntDefault("Visibility.GroupMode", 1); m_int_configs[CONFIG_MAIL_DELIVERY_DELAY] = sConfigMgr->GetIntDefault("MailDeliveryDelay", HOUR); + m_int_configs[CONFIG_CLEAN_OLD_MAIL_TIME] = sConfigMgr->GetIntDefault("CleanOldMailTime", 4); + if (m_int_configs[CONFIG_CLEAN_OLD_MAIL_TIME] > 23) + { + TC_LOG_ERROR("server.loading", "CleanOldMailTime (%u) must be an hour, between 0 and 23. Set to 4.", m_int_configs[CONFIG_CLEAN_OLD_MAIL_TIME]); + m_int_configs[CONFIG_CLEAN_OLD_MAIL_TIME] = 4; + } m_int_configs[CONFIG_UPTIME_UPDATE] = sConfigMgr->GetIntDefault("UpdateUptimeInterval", 10); if (int32(m_int_configs[CONFIG_UPTIME_UPDATE]) <= 0) @@ -2259,7 +2265,8 @@ void World::SetInitialWorldSettings() tm localTm; time_t gameTime = GameTime::GetGameTime(); localtime_r(&gameTime, &localTm); - mail_timer = ((((localTm.tm_hour + 20) % 24)* HOUR * IN_MILLISECONDS) / m_timers[WUPDATE_AUCTIONS].GetInterval()); + uint8 CleanOldMailsTime = getIntConfig(CONFIG_CLEAN_OLD_MAIL_TIME); + mail_timer = ((((localTm.tm_hour + (24 - CleanOldMailsTime)) % 24)* HOUR * IN_MILLISECONDS) / m_timers[WUPDATE_AUCTIONS].GetInterval()); //1440 mail_timer_expires = ((DAY * IN_MILLISECONDS) / (m_timers[WUPDATE_AUCTIONS].GetInterval())); TC_LOG_INFO("server.loading", "Mail timer set to: " UI64FMTD ", mail return is called every " UI64FMTD " minutes", uint64(mail_timer), uint64(mail_timer_expires)); diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 3160ff92595..46fbdf9610f 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -278,6 +278,7 @@ enum WorldIntConfigs CONFIG_FORCE_SHUTDOWN_THRESHOLD, CONFIG_GROUP_VISIBILITY, CONFIG_MAIL_DELIVERY_DELAY, + CONFIG_CLEAN_OLD_MAIL_TIME, CONFIG_UPTIME_UPDATE, CONFIG_SKILL_CHANCE_ORANGE, CONFIG_SKILL_CHANCE_YELLOW, diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index c4a07abb5fd..1548d3eb2bd 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -1161,6 +1161,14 @@ MaxRecruitAFriendBonusDistance = 100 MailDeliveryDelay = 3600 # +# CleanOldMailTime +# Description: The hour at which old mails will be returned or deleted by the server. +# This can be any integer number from 0 to 23. 20 will be 8pm server time. +# Default: 4 - 4am + +CleanOldMailTime = 4 + +# # SkillChance.Prospecting # Description: Allow skill increase from prospecting. # Default: 0 - (Disabled) |