diff options
Diffstat (limited to 'src/game/Level1.cpp')
| -rw-r--r-- | src/game/Level1.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp index d31cf17b567..9a9c60f245e 100644 --- a/src/game/Level1.cpp +++ b/src/game/Level1.cpp @@ -495,7 +495,7 @@ bool ChatHandler::HandleGMTicketAssignToCommand(const char* args) SendSysMessage(LANG_COMMAND_TICKETNOTEXIST); return true; } - + uint64 tarGUID = objmgr.GetPlayerGUIDByName(targm.c_str()); uint64 accid = objmgr.GetPlayerAccountIdByGUID(tarGUID); uint32 gmlevel = accmgr.GetSecurity(accid, realmID); @@ -2205,6 +2205,13 @@ bool ChatHandler::HandleTeleCommand(const char * args) return false; } + if (_player->isInCombat()) + { + SendSysMessage(LANG_YOU_IN_COMBAT); + SetSentErrorMessage(true); + return false; + } + MapEntry const * me = sMapStore.LookupEntry(tele->mapId); if(!me || me->IsBattleGroundOrArena()) { |