From fdacf127395965b426185f05a7b1351138775e89 Mon Sep 17 00:00:00 2001 From: Treeston Date: Sat, 6 Jan 2018 01:40:31 +0100 Subject: Core/Combat: Some more sanity check asserts to try and track down #21187. Also, some anti-annoyance treatment for dot tele. --- src/server/scripts/Commands/cs_tele.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/server/scripts/Commands') diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index e762793a188..3a9c0331cb2 100644 --- a/src/server/scripts/Commands/cs_tele.cpp +++ b/src/server/scripts/Commands/cs_tele.cpp @@ -306,7 +306,6 @@ public: // id, or string, or [name] Shift-click form |color|Htele:id|h[name]|h|r GameTele const* tele = handler->extractGameTeleFromLink((char*)args); - if (!tele) { handler->SendSysMessage(LANG_COMMAND_TELE_NOTFOUND); @@ -314,7 +313,7 @@ public: return false; } - if (me->IsInCombat()) + if (me->IsInCombat() && !handler->GetSession()->HasPermission(rbac::RBAC_PERM_COMMAND_TELE_NAME)) { handler->SendSysMessage(LANG_YOU_IN_COMBAT); handler->SetSentErrorMessage(true); -- cgit v1.2.3