From e43d81cd687a0c18ebec3f320f53a780d950843d Mon Sep 17 00:00:00 2001 From: Regigicas Date: Sat, 15 Jul 2017 13:43:03 +0200 Subject: Scripts/Commands: Fix a crash on summon when no group is avaible (#20029) Closes #20027 (cherry picked from commit d9c83a6c0143b17286f853f8b81e3dc6fd86642d) --- src/server/scripts/Commands/cs_misc.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/server/scripts/Commands') diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 669d4ecffe9..28e74d257d6 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -557,9 +557,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())) -- cgit v1.2.3