Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Garrisons: Fixed entering/leaving garrisons from a different map than Draenor

Browse Source
This commit is contained in:
Shauren
2015-07-26 18:52:28 +02:00
parent 5c813f6f02
commit d7f2ce6496
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/server/game/Garrison/Garrison.cpp
View File

@@ -277,18 +277,27 @@ void Garrison::Upgrade()
void Garrison::Enter() const
{
WorldLocation loc(_siteLevel->MapID);
loc.Relocate(_owner);
_owner->TeleportTo(loc, TELE_TO_SEAMLESS);
if (MapEntry const* map = sMapStore.LookupEntry(_siteLevel->MapID))
{
if (int32(_owner->GetMapId()) == map->ParentMapID)
{
WorldLocation loc(_siteLevel->MapID);
loc.Relocate(_owner);
_owner->TeleportTo(loc, TELE_TO_SEAMLESS);
}
}
}
void Garrison::Leave() const
{
if (MapEntry const* map = sMapStore.LookupEntry(_siteLevel->MapID))
{
WorldLocation loc(map->ParentMapID);
loc.Relocate(_owner);
_owner->TeleportTo(loc, TELE_TO_SEAMLESS);
if (_owner->GetMapId() == _siteLevel->MapID)
{
WorldLocation loc(map->ParentMapID);
loc.Relocate(_owner);
_owner->TeleportTo(loc, TELE_TO_SEAMLESS);
}
}
}