Scripts/Commands: Fix a potential crash when summoning players that are just logging on.

2 files changed, 2 insertions, 2 deletions

diff --git a/src/server/scripts/Commands/cs_group.cpp b/src/server/scripts/Commands/cs_group.cpp
index ed69c88ee21..adb50c105d1 100644
--- a/src/server/scripts/Commands/cs_group.cpp
+++ b/src/server/scripts/Commands/cs_group.cpp
@@ -115,7 +115,7 @@ public:
 
             std::string plNameLink = handler->GetNameLink(player);
 
-            if (player->IsBeingTeleported())
+            if (!player->IsInWorld() || player->IsBeingTeleported())
             {
                 handler->PSendSysMessage(LANG_IS_TELEPORTED, plNameLink.c_str());
                 continue;
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index f57d960d08a..5d4a3396519 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -513,7 +513,7 @@ public:
             if (handler->HasLowerSecurity(target, ObjectGuid::Empty))
                 return false;
 
-            if (target->IsBeingTeleported())
+            if (!target->IsInWorld() || target->IsBeingTeleported())
             {
                 handler->PSendSysMessage(LANG_IS_TELEPORTED, nameLink.c_str());
                 handler->SetSentErrorMessage(true);