aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps/Map.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
-rw-r--r--src/server/game/Maps/Map.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index c886f41ae44..b98d309346d 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -1967,7 +1967,7 @@ void Map::SendObjectUpdates()
while (!_updateObjects.empty())
{
- Object* obj = *_updateObjects.begin();
+ BaseEntity* obj = *_updateObjects.begin();
ASSERT(obj->IsInWorld());
_updateObjects.erase(_updateObjects.begin());
obj->BuildUpdate(update_players);
@@ -2907,6 +2907,10 @@ TransferAbortParams InstanceMap::CannotEnter(Player* player)
return lockError;
}
+ if (Group* owningGroup = GetOwningGroup())
+ if (!player->IsInGroup(owningGroup->GetGUID()))
+ return TRANSFER_ABORT_MAX_PLAYERS;
+
return Map::CannotEnter(player);
}