From aa9f8ef96b2deadffe1a40c36e956abf9e1142ed Mon Sep 17 00:00:00 2001 From: Treeston Date: Sat, 6 Jan 2018 13:32:11 +0100 Subject: [PATCH] Revert "Scripts/Commands: Allow to use .tele in combat only to GMs" This reverts commit 3ae5b72075925f896c53603c26b2aa0dd7708fbf - see discussion on commit. --- src/server/scripts/Commands/cs_tele.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index 85b86eb685f..7a58d4c7f07 100644 --- a/src/server/scripts/Commands/cs_tele.cpp +++ b/src/server/scripts/Commands/cs_tele.cpp @@ -301,7 +301,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);