public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 15:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Battlegrounds): remove unused ApplyPhaseMask from Arathi Basin (#24582)

Browse Source 
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
This commit is contained in:
blinkysc
2026-02-09 21:28:44 -06:00
committed by GitHub
parent 22cf31365e
commit f0e5f32b4e
2 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
View File

@@ -180,9 +180,8 @@ void BattlegroundAB::AddPlayer(Player* player)
PlayerScores.emplace(player->GetGUID().GetCounter(), new BattlegroundABScore(player->GetGUID())); PlayerScores.emplace(player->GetGUID().GetCounter(), new BattlegroundABScore(player->GetGUID()));
} }
void BattlegroundAB::RemovePlayer(Player* player) void BattlegroundAB::RemovePlayer(Player* /*player*/)
{ {
player->SetPhaseMask(1, false);
} }
void BattlegroundAB::HandleAreaTrigger(Player* player, uint32 trigger) void BattlegroundAB::HandleAreaTrigger(Player* player, uint32 trigger)
@@ -269,7 +268,6 @@ void BattlegroundAB::SendNodeUpdate(uint8 node)
void BattlegroundAB::NodeOccupied(uint8 node) void BattlegroundAB::NodeOccupied(uint8 node)
{ {
ApplyPhaseMask();
AddSpiritGuide(node, BG_AB_SpiritGuidePos[node][0], BG_AB_SpiritGuidePos[node][1], BG_AB_SpiritGuidePos[node][2], BG_AB_SpiritGuidePos[node][3], _capturePointInfo[node]._ownerTeamId); AddSpiritGuide(node, BG_AB_SpiritGuidePos[node][0], BG_AB_SpiritGuidePos[node][1], BG_AB_SpiritGuidePos[node][2], BG_AB_SpiritGuidePos[node][3], _capturePointInfo[node]._ownerTeamId);
++_controlledPoints[_capturePointInfo[node]._ownerTeamId]; ++_controlledPoints[_capturePointInfo[node]._ownerTeamId];
@@ -392,7 +390,6 @@ void BattlegroundAB::EventPlayerClickedOnFlag(Player* player, GameObject* gameOb
_capturePointInfo[node]._state = static_cast<uint8>(BG_AB_NODE_STATE_ALLY_CONTESTED) + player->GetTeamId(); _capturePointInfo[node]._state = static_cast<uint8>(BG_AB_NODE_STATE_ALLY_CONTESTED) + player->GetTeamId();
ApplyPhaseMask();
_bgEvents.RescheduleEvent(BG_AB_EVENT_CAPTURE_STABLE + node, BG_AB_FLAG_CAPTURING_TIME); _bgEvents.RescheduleEvent(BG_AB_EVENT_CAPTURE_STABLE + node, BG_AB_FLAG_CAPTURING_TIME);
sound = player->GetTeamId() == TEAM_ALLIANCE ? BG_AB_SOUND_NODE_ASSAULTED_ALLIANCE : BG_AB_SOUND_NODE_ASSAULTED_HORDE; sound = player->GetTeamId() == TEAM_ALLIANCE ? BG_AB_SOUND_NODE_ASSAULTED_ALLIANCE : BG_AB_SOUND_NODE_ASSAULTED_HORDE;
@@ -547,19 +544,3 @@ bool BattlegroundAB::AllNodesConrolledByTeam(TeamId teamId) const
{ {
return _controlledPoints[teamId] == BG_AB_DYNAMIC_NODES_COUNT; return _controlledPoints[teamId] == BG_AB_DYNAMIC_NODES_COUNT;
} }
void BattlegroundAB::ApplyPhaseMask()
{
uint32 phaseMask = 1;
for (uint32 i = BG_AB_NODE_STABLES; i < BG_AB_DYNAMIC_NODES_COUNT; ++i)
if (_capturePointInfo[i]._ownerTeamId != TEAM_NEUTRAL)
phaseMask |= 1 << (i * 2 + 1 + _capturePointInfo[i]._ownerTeamId);
const BattlegroundPlayerMap& bgPlayerMap = GetPlayers();
for (auto const& itr : bgPlayerMap)
{
itr.second->SetPhaseMask(phaseMask, false);
itr.second->UpdateObjectVisibility(true, false);
}
}

1
src/server/game/Battlegrounds/Zones/BattlegroundAB.h
View File

@@ -278,7 +278,6 @@ private:
void SendNodeUpdate(uint8 node); void SendNodeUpdate(uint8 node);
void NodeOccupied(uint8 node); void NodeOccupied(uint8 node);
void NodeDeoccupied(uint8 node); void NodeDeoccupied(uint8 node);
void ApplyPhaseMask();
struct CapturePointInfo struct CapturePointInfo
{ {