Core/Garrisons: Fixed loading building spawns when logging in on garrison map

1 files changed, 17 insertions, 1 deletions

diff --git a/src/server/game/Garrison/GarrisonMap.cpp b/src/server/game/Garrison/GarrisonMap.cpp
index 7316504d185..b9cf63140b4 100644
--- a/src/server/game/Garrison/GarrisonMap.cpp
+++ b/src/server/game/Garrison/GarrisonMap.cpp
@@ -97,7 +97,7 @@ void GarrisonGridLoader::Visit(CreatureMapType& /*m*/)
 }
 
 GarrisonMap::GarrisonMap(uint32 id, time_t expiry, uint32 instanceId, Map* parent, ObjectGuid const& owner)
-    : Map(id, expiry, instanceId, DIFFICULTY_NORMAL, parent), _owner(owner)
+    : Map(id, expiry, instanceId, DIFFICULTY_NORMAL, parent), _owner(owner), _loadingPlayer(nullptr)
 {
     GarrisonMap::InitVisibilityDistance();
 }
@@ -112,6 +112,9 @@ void GarrisonMap::LoadGridObjects(NGridType* grid, Cell const& cell)
 
 Garrison* GarrisonMap::GetGarrison()
 {
+    if (_loadingPlayer)
+        return _loadingPlayer->GetGarrison();
+
     if (Player* owner = ObjectAccessor::FindConnectedPlayer(_owner))
         return owner->GetGarrison();
 
@@ -124,3 +127,16 @@ void GarrisonMap::InitVisibilityDistance()
     m_VisibleDistance = World::GetMaxVisibleDistanceInBGArenas();
     m_VisibilityNotifyPeriod = World::GetVisibilityNotifyPeriodInBGArenas();
 }
+
+bool GarrisonMap::AddPlayerToMap(Player* player, bool initPlayer /*= true*/)
+{
+    if (player->GetGUID() == _owner)
+        _loadingPlayer = player;
+
+    bool result = Map::AddPlayerToMap(player, initPlayer);
+
+    if (player->GetGUID() == _owner)
+        _loadingPlayer = nullptr;
+
+    return result;
+}