Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 16:10:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Combat: Some more sanity check asserts to try and track down #21187.

Browse Source 
Also, some anti-annoyance treatment for dot tele.

(cherry picked from commit fdacf12739)
This commit is contained in:
Treeston
2018-01-06 01:40:31 +01:00
committed by Shauren
parent 2a7bb9b404
commit dce39aedc2
6 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/scripts/Commands/cs_tele.cpp
View File

@@ -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);