yolinlin/azerothcore-wotlk-pbot
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2025-11-29 17:38:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Core/Arena: fix auto distribute arena points and config option. (#927)

Browse Source
This commit is contained in:
Viste(Кирилл)
2018-06-16 19:28:44 +03:00
committed by Lee
parent 8d2555ed04
commit a303ba3da3
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@
/*********************************************************/ /*********************************************************/
BattlegroundMgr::BattlegroundMgr() : randomBgDifficultyEntry(999, 0, 80, 80, 0), m_ArenaTesting(false), m_Testing(false), BattlegroundMgr::BattlegroundMgr() : randomBgDifficultyEntry(999, 0, 80, 80, 0), m_ArenaTesting(false), m_Testing(false),
m_lastClientVisibleInstanceId(0), m_NextAutoDistributionTime(0), m_NextPeriodicQueueUpdateTime(5*IN_MILLISECONDS) m_lastClientVisibleInstanceId(0), m_NextAutoDistributionTime(0), m_AutoDistributionTimeChecker(0), m_NextPeriodicQueueUpdateTime(5*IN_MILLISECONDS)
{ {
for (uint32 qtype = BATTLEGROUND_QUEUE_NONE; qtype < MAX_BATTLEGROUND_QUEUE_TYPES; ++qtype) for (uint32 qtype = BATTLEGROUND_QUEUE_NONE; qtype < MAX_BATTLEGROUND_QUEUE_TYPES; ++qtype)
m_BattlegroundQueues[qtype].SetBgTypeIdAndArenaType(BGTemplateId(BattlegroundQueueTypeId(qtype)), BGArenaType(BattlegroundQueueTypeId(qtype))); m_BattlegroundQueues[qtype].SetBgTypeIdAndArenaType(BGTemplateId(BattlegroundQueueTypeId(qtype)), BGArenaType(BattlegroundQueueTypeId(qtype)));
@@ -126,12 +126,18 @@ void BattlegroundMgr::Update(uint32 diff)
// arena points auto-distribution // arena points auto-distribution
if (sWorld->getBoolConfig(CONFIG_ARENA_AUTO_DISTRIBUTE_POINTS)) if (sWorld->getBoolConfig(CONFIG_ARENA_AUTO_DISTRIBUTE_POINTS))
{ {
if (sWorld->GetGameTime() > m_NextAutoDistributionTime) if (m_AutoDistributionTimeChecker < diff)
{ {
sArenaTeamMgr->DistributeArenaPoints(); if (time(NULL) > m_NextAutoDistributionTime)
m_NextAutoDistributionTime = sWorld->GetNextTimeWithDayAndHour(5, 18); {
sWorld->setWorldState(WS_ARENA_DISTRIBUTION_TIME, uint64(m_NextAutoDistributionTime)); sArenaTeamMgr->DistributeArenaPoints();
m_NextAutoDistributionTime = m_NextAutoDistributionTime + BATTLEGROUND_ARENA_POINT_DISTRIBUTION_DAY * sWorld->getIntConfig(CONFIG_ARENA_AUTO_DISTRIBUTE_INTERVAL_DAYS);
sWorld->setWorldState(WS_ARENA_DISTRIBUTION_TIME, uint64(m_NextAutoDistributionTime));
}
m_AutoDistributionTimeChecker = 600000; // 10 minutes check
} }
else
m_AutoDistributionTimeChecker -= diff;
} }
} }
@@ -687,9 +693,16 @@ void BattlegroundMgr::InitAutomaticArenaPointDistribution()
return; return;
time_t wstime = time_t(sWorld->getWorldState(WS_ARENA_DISTRIBUTION_TIME)); time_t wstime = time_t(sWorld->getWorldState(WS_ARENA_DISTRIBUTION_TIME));
m_NextAutoDistributionTime = wstime ? wstime : sWorld->GetNextTimeWithDayAndHour(5, 18); time_t curtime = time(NULL);
if (!wstime) sLog->outString("AzerothCore Battleground: Initializing Automatic Arena Point Distribution");
sWorld->setWorldState(WS_ARENA_DISTRIBUTION_TIME, uint64(m_NextAutoDistributionTime)); if (wstime < curtime)
{
m_NextAutoDistributionTime = curtime; // reset will be called in the next update
sLog->outString("AzerothCore Battleground: Battleground: Next arena point distribution time in the past, reseting it now.");
}
else
m_NextAutoDistributionTime = wstime;
sLog->outString("AzerothCore Battleground: Automatic Arena Point Distribution initialized.");
} }
void BattlegroundMgr::BuildBattlegroundListPacket(WorldPacket* data, uint64 guid, Player* player, BattlegroundTypeId bgTypeId, uint8 fromWhere) void BattlegroundMgr::BuildBattlegroundListPacket(WorldPacket* data, uint64 guid, Player* player, BattlegroundTypeId bgTypeId, uint8 fromWhere)

3
src/server/game/Battlegrounds/BattlegroundMgr.h
View File

@@ -17,6 +17,8 @@
typedef std::map<uint32, Battleground*> BattlegroundContainer; typedef std::map<uint32, Battleground*> BattlegroundContainer;
typedef UNORDERED_MAP<uint32, BattlegroundTypeId> BattleMastersMap; typedef UNORDERED_MAP<uint32, BattlegroundTypeId> BattleMastersMap;
#define BATTLEGROUND_ARENA_POINT_DISTRIBUTION_DAY 86400 // how many seconds in day
struct CreateBattlegroundData struct CreateBattlegroundData
{ {
BattlegroundTypeId bgTypeId; BattlegroundTypeId bgTypeId;
@@ -146,6 +148,7 @@ class BattlegroundMgr
bool m_Testing; bool m_Testing;
uint32 m_lastClientVisibleInstanceId; uint32 m_lastClientVisibleInstanceId;
time_t m_NextAutoDistributionTime; time_t m_NextAutoDistributionTime;
uint32 m_AutoDistributionTimeChecker;
uint32 m_NextPeriodicQueueUpdateTime; uint32 m_NextPeriodicQueueUpdateTime;
BattleMastersMap mBattleMastersMap; BattleMastersMap mBattleMastersMap;
}; };