aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2018-01-06 13:32:11 +0100
committerTreeston <treeston.mmoc@gmail.com>2018-01-06 13:32:11 +0100
commitcbf5535b74fc4b50cb76e84e557a44e8e1b93203 (patch)
treea6a74d9b7ef978f42ab18ee04ab374cc24278ab6
parentb2b4f9d1e4562ec246efb5136c1c674ec78f50b7 (diff)
Revert "Scripts/Commands: Allow to use .tele in combat only to GMs"
This reverts commit 3ae5b72075925f896c53603c26b2aa0dd7708fbf - see discussion on commit.
-rw-r--r--src/server/scripts/Commands/cs_tele.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp
index 13355f4cf18..3a9c0331cb2 100644
--- a/src/server/scripts/Commands/cs_tele.cpp
+++ b/src/server/scripts/Commands/cs_tele.cpp
@@ -313,7 +313,7 @@ public:
return false;
}
- if (me->IsInCombat() && !me->CanBeGameMaster())
+ if (me->IsInCombat() && !handler->GetSession()->HasPermission(rbac::RBAC_PERM_COMMAND_TELE_NAME))
{
handler->SendSysMessage(LANG_YOU_IN_COMBAT);
handler->SetSentErrorMessage(true);