diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2018-01-06 01:40:31 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-05-16 21:56:05 +0200 |
| commit | dce39aedc242ecb6e4b1b8dbf8510389dbeecfd2 (patch) | |
| tree | 3c8ae5127e5bdf430d6960ed1ad1f15a58f08033 /src/server/scripts/Commands | |
| parent | 2a7bb9b4044bbd9f841c5e87a8a910fe4205d4d4 (diff) | |
Core/Combat: Some more sanity check asserts to try and track down #21187.
Also, some anti-annoyance treatment for dot tele.
(cherry picked from commit fdacf127395965b426185f05a7b1351138775e89)
Diffstat (limited to 'src/server/scripts/Commands')
| -rw-r--r-- | src/server/scripts/Commands/cs_tele.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index 41fcd95647b..93b55b5d1ef 100644 --- a/src/server/scripts/Commands/cs_tele.cpp +++ b/src/server/scripts/Commands/cs_tele.cpp @@ -307,7 +307,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); @@ -315,7 +314,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); |