aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRegigicas <regigicas@hotmail.es>2017-07-15 13:43:03 +0200
committerDuarte Duarte <dnpd.dd@gmail.com>2017-07-15 12:43:03 +0100
commitd9c83a6c0143b17286f853f8b81e3dc6fd86642d (patch)
tree27d75c4b15737ca1bf01d425dbccb1ae5b325ea0
parent9c1a426202baf40412bb3ce8f97a9ac0820c9dfd (diff)
Scripts/Commands: Fix a crash on summon when no group is avaible (#20029)
Closes #20027
-rw-r--r--src/server/scripts/Commands/cs_misc.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index 29f1a0763fb..f57d960d08a 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -544,9 +544,10 @@ public:
}
else if (map->Instanceable())
{
- Group* targetGroup = target->GetGroup();
Map* targetMap = target->GetMap();
- Player* targetGroupLeader = ObjectAccessor::GetPlayer(map, targetGroup->GetLeaderGUID());
+ Player* targetGroupLeader = nullptr;
+ if (Group* targetGroup = target->GetGroup())
+ targetGroupLeader = ObjectAccessor::GetPlayer(map, targetGroup->GetLeaderGUID());
// check if far teleport is allowed
if (!targetGroupLeader || (targetGroupLeader->GetMapId() != map->GetId()) || (targetGroupLeader->GetInstanceId() != map->GetInstanceId()))