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

*Make .namego and .goname more flexible when summoning players to/from instances & BGs

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-08-26 22:17:40 -07:00
parent 35c57db00a
commit d2ae7e1cd4
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/game/Level1.cpp
View File

@@ -814,9 +814,10 @@ bool ChatHandler::HandleNamegoCommand(const char* args)
// if both players are in different bgs
else if (target->GetBattleGroundId() && m_session->GetPlayer()->GetBattleGroundId() != target->GetBattleGroundId())
{
PSendSysMessage(LANG_CANNOT_GO_TO_BG_FROM_BG,nameLink.c_str());
SetSentErrorMessage(true);
return false;
target->LeaveBattleground(false); // Note: should be changed so target gets no Deserter debuff
//PSendSysMessage(LANG_CANNOT_GO_TO_BG_FROM_BG,nameLink.c_str());
//SetSentErrorMessage(true);
//return false;
}
// all's well, set bg id
// when porting out from the bg, it will be reset to 0
@@ -829,10 +830,11 @@ bool ChatHandler::HandleNamegoCommand(const char* args)
Map* cMap = target->GetMap();
if (cMap->Instanceable() && cMap->GetInstanceId() != pMap->GetInstanceId())
{
target->UnbindInstance(pMap->GetInstanceId(), target->GetDifficulty(), true);
// cannot summon from instance to instance
PSendSysMessage(LANG_CANNOT_SUMMON_TO_INST,nameLink.c_str());
SetSentErrorMessage(true);
return false;
//PSendSysMessage(LANG_CANNOT_SUMMON_TO_INST,nameLink.c_str());
//SetSentErrorMessage(true);
//return false;
}
// we are in instance, and can summon only player in our group with us as lead
@@ -929,9 +931,10 @@ bool ChatHandler::HandleGonameCommand(const char* args)
// if both players are in different bgs
else if (_player->GetBattleGroundId() && _player->GetBattleGroundId() != target->GetBattleGroundId())
{
PSendSysMessage(LANG_CANNOT_GO_TO_BG_FROM_BG,chrNameLink.c_str());
SetSentErrorMessage(true);
return false;
_player->LeaveBattleground(false); // Note: should be changed so _player gets no Deserter debuff
//PSendSysMessage(LANG_CANNOT_GO_TO_BG_FROM_BG,chrNameLink.c_str());
//SetSentErrorMessage(true);
//return false;
}
// all's well, set bg id
// when porting out from the bg, it will be reset to 0