Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Wintergrasp: fix leaving Wintergrasp via the minimap button.

Browse Source
This commit is contained in:
SnapperRy
2016-10-04 19:13:11 +02:00
parent 63215dd15a
commit b60db6c44e
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -375,6 +375,14 @@ void Battlefield::AskToLeaveQueue(Player* player)
m_PlayersInQueue[player->GetTeamId()].erase(player->GetGUID());
}
// Called in WorldSession::HandleHearthAndResurrect
void Battlefield::PlayerAskToLeave(Player* player)
{
// Player leaving Wintergrasp, teleport to Dalaran.
// ToDo: confirm teleport destination.
player->TeleportTo(571, 5804.1499f, 624.7710f, 647.7670f, 1.6400f);
}
// Called in WorldSession::HandleBfEntryInviteResponse
void Battlefield::PlayerAcceptInviteToWar(Player* player)
{

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

@@ -309,6 +309,7 @@ class TC_GAME_API Battlefield : public ZoneScript
void PlayerAcceptInviteToWar(Player* player);
uint32 GetBattleId() const { 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

@@ -1741,9 +1741,9 @@ void WorldSession::HandleHearthAndResurrect(WorldPacket& /*recvData*/)
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;
}