aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortreeston <treeston.mmoc@gmail.com>2017-07-17 23:23:54 +0200
committertreeston <treeston.mmoc@gmail.com>2017-07-17 23:23:54 +0200
commite0194e4a2c659597da18e220000055484ff504ad (patch)
tree298f8d5d45754c04add6964b7d2d12d0eb48350e
parent05cdcdb230a9d69f8ad8f2af696f452151a1c364 (diff)
Revert "Scripts/Commands: Fix a potential crash when summoning players that are just logging on." - the check was unnecessary (already done in extractPlayerTarget).
This reverts commit 05cdcdb230a9d69f8ad8f2af696f452151a1c364.
-rw-r--r--src/server/scripts/Commands/cs_group.cpp2
-rw-r--r--src/server/scripts/Commands/cs_misc.cpp2
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 adb50c105d1..ed69c88ee21 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->IsInWorld() || player->IsBeingTeleported())
+ if (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 5d4a3396519..f57d960d08a 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->IsInWorld() || target->IsBeingTeleported())
+ if (target->IsBeingTeleported())
{
handler->PSendSysMessage(LANG_IS_TELEPORTED, nameLink.c_str());
handler->SetSentErrorMessage(true);