fix(Core/Wintergrasp): Leaving Wintergrasp with the minimap button (#2018)
This commit is contained in:
@@ -396,6 +396,13 @@ void Battlefield::AskToLeaveQueue(Player* player)
|
|||||||
m_PlayersInQueue[player->GetTeamId()].erase(player->GetGUID());
|
m_PlayersInQueue[player->GetTeamId()].erase(player->GetGUID());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Called in WorldSession::HandleHearthAndResurrect
|
||||||
|
void Battlefield::PlayerAskToLeave(Player* player)
|
||||||
|
{
|
||||||
|
// Player leaving Wintergrasp, trigger Hearthstone spell.
|
||||||
|
player->CastSpell(player, 8690, true);
|
||||||
|
}
|
||||||
|
|
||||||
// Called in WorldSession::HandleBfEntryInviteResponse
|
// Called in WorldSession::HandleBfEntryInviteResponse
|
||||||
void Battlefield::PlayerAcceptInviteToWar(Player* player)
|
void Battlefield::PlayerAcceptInviteToWar(Player* player)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -321,6 +321,7 @@ class Battlefield : public ZoneScript
|
|||||||
void PlayerAcceptInviteToWar(Player* player);
|
void PlayerAcceptInviteToWar(Player* player);
|
||||||
uint32 GetBattleId() { return m_BattleId; }
|
uint32 GetBattleId() { return m_BattleId; }
|
||||||
void AskToLeaveQueue(Player* player);
|
void AskToLeaveQueue(Player* player);
|
||||||
|
void PlayerAskToLeave(Player* player);
|
||||||
|
|
||||||
//virtual void DoCompleteOrIncrementAchievement(uint32 /*achievement*/, Player* /*player*/, uint8 /*incrementNumber = 1*/) {};
|
//virtual void DoCompleteOrIncrementAchievement(uint32 /*achievement*/, Player* /*player*/, uint8 /*incrementNumber = 1*/) {};
|
||||||
|
|
||||||
|
|||||||
@@ -1927,9 +1927,9 @@ void WorldSession::HandleHearthAndResurrect(WorldPacket& /*recv_data*/)
|
|||||||
if (_player->IsInFlight())
|
if (_player->IsInFlight())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(/*Battlefield* bf = */sBattlefieldMgr->GetBattlefieldToZoneId(_player->GetZoneId()))
|
if(Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(_player->GetZoneId()))
|
||||||
{
|
{
|
||||||
// bf->PlayerAskToLeave(_player); FIXME
|
bf->PlayerAskToLeave(_player);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user