nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-27 07:36:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Wintergrasp): Leaving Wintergrasp with the minimap button (#2018)

Browse Source
This commit is contained in:
Poszer
2019-07-04 09:01:24 +02:00
committed by Stoabrogga
parent 5086af8190
commit e14964c52b
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/game/Battlefield/Battlefield.cpp
View File

@@ -396,6 +396,13 @@ void Battlefield::AskToLeaveQueue(Player* player)
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
void Battlefield::PlayerAcceptInviteToWar(Player* player)
{

1
src/server/game/Battlefield/Battlefield.h
View File

@@ -321,6 +321,7 @@ class Battlefield : public ZoneScript
void PlayerAcceptInviteToWar(Player* player);
uint32 GetBattleId() { return m_BattleId; }
void AskToLeaveQueue(Player* player);
void PlayerAskToLeave(Player* player);
//virtual void DoCompleteOrIncrementAchievement(uint32 /*achievement*/, Player* /*player*/, uint8 /*incrementNumber = 1*/) {};

4
src/server/game/Handlers/MiscHandler.cpp
View File

@@ -1927,9 +1927,9 @@ void WorldSession::HandleHearthAndResurrect(WorldPacket& /*recv_data*/)
if (_player->IsInFlight())
return;
if(/*Battlefield* bf = */sBattlefieldMgr->GetBattlefieldToZoneId(_player->GetZoneId()))
if(Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(_player->GetZoneId()))
{
// bf->PlayerAskToLeave(_player); FIXME
bf->PlayerAskToLeave(_player);
return;
}