mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 07:37:01 +00:00
[7221] Add output player names as sift-links in more chat commands.
This commit is contained in:
parent
e83be70aca
commit
42e12136a8
7 changed files with 110 additions and 126 deletions
|
|
@ -780,7 +780,7 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args)
|
|||
|
||||
if(targetPlayer)
|
||||
{
|
||||
ChatHandler(targetPlayer).PSendSysMessage(LANG_YOURS_SECURITY_CHANGED,GetName(), gm);
|
||||
ChatHandler(targetPlayer).PSendSysMessage(LANG_YOURS_SECURITY_CHANGED,GetNameLink().c_str(), gm);
|
||||
targetPlayer->GetSession()->SetSecurity(gm);
|
||||
}
|
||||
|
||||
|
|
@ -926,9 +926,11 @@ bool ChatHandler::HandleSetSkillCommand(const char* args)
|
|||
return false;
|
||||
}
|
||||
|
||||
std::string tNameLink = GetNameLink(target);
|
||||
|
||||
if(!target->GetSkillValue(skill))
|
||||
{
|
||||
PSendSysMessage(LANG_SET_SKILL_ERROR, target->GetName(), skill, sl->name[0]);
|
||||
PSendSysMessage(LANG_SET_SKILL_ERROR, tNameLink.c_str(), skill, sl->name[0]);
|
||||
SetSentErrorMessage(true);
|
||||
return false;
|
||||
}
|
||||
|
|
@ -939,7 +941,7 @@ bool ChatHandler::HandleSetSkillCommand(const char* args)
|
|||
return false;
|
||||
|
||||
target->SetSkill(skill, level, max);
|
||||
PSendSysMessage(LANG_SET_SKILL, skill, sl->name[0], target->GetName(), level, max);
|
||||
PSendSysMessage(LANG_SET_SKILL, skill, sl->name[0], tNameLink.c_str(), level, max);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
@ -986,10 +988,12 @@ bool ChatHandler::HandleCooldownCommand(const char* args)
|
|||
return false;
|
||||
}
|
||||
|
||||
std::string tNameLink = GetNameLink(target);
|
||||
|
||||
if (!*args)
|
||||
{
|
||||
target->RemoveAllSpellCooldown();
|
||||
PSendSysMessage(LANG_REMOVEALL_COOLDOWN, target->GetName());
|
||||
PSendSysMessage(LANG_REMOVEALL_COOLDOWN, tNameLink.c_str());
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1000,7 +1004,7 @@ bool ChatHandler::HandleCooldownCommand(const char* args)
|
|||
|
||||
if(!sSpellStore.LookupEntry(spell_id))
|
||||
{
|
||||
PSendSysMessage(LANG_UNKNOWN_SPELL, target==m_session->GetPlayer() ? GetMangosString(LANG_YOU) : target->GetName());
|
||||
PSendSysMessage(LANG_UNKNOWN_SPELL, target==m_session->GetPlayer() ? GetMangosString(LANG_YOU) : tNameLink.c_str());
|
||||
SetSentErrorMessage(true);
|
||||
return false;
|
||||
}
|
||||
|
|
@ -1010,7 +1014,7 @@ bool ChatHandler::HandleCooldownCommand(const char* args)
|
|||
data << uint64(target->GetGUID());
|
||||
target->GetSession()->SendPacket(&data);
|
||||
target->RemoveSpellCooldown(spell_id);
|
||||
PSendSysMessage(LANG_REMOVE_COOLDOWN, spell_id, target==m_session->GetPlayer() ? GetMangosString(LANG_YOU) : target->GetName());
|
||||
PSendSysMessage(LANG_REMOVE_COOLDOWN, spell_id, target==m_session->GetPlayer() ? GetMangosString(LANG_YOU) : tNameLink.c_str());
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
@ -1814,9 +1818,7 @@ bool ChatHandler::HandleLearnAllDefaultCommand(const char* args)
|
|||
player->learnDefaultSpells();
|
||||
player->learnQuestRewardedSpells();
|
||||
|
||||
std::string nameLink = playerLink(player->GetName());
|
||||
|
||||
PSendSysMessage(LANG_COMMAND_LEARN_ALL_DEFAULT_AND_QUEST,nameLink.c_str());
|
||||
PSendSysMessage(LANG_COMMAND_LEARN_ALL_DEFAULT_AND_QUEST,GetNameLink(player).c_str());
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -1852,7 +1854,7 @@ bool ChatHandler::HandleLearnCommand(const char* args)
|
|||
if(targetPlayer == m_session->GetPlayer())
|
||||
SendSysMessage(LANG_YOU_KNOWN_SPELL);
|
||||
else
|
||||
PSendSysMessage(LANG_TARGET_KNOWN_SPELL,targetPlayer->GetName());
|
||||
PSendSysMessage(LANG_TARGET_KNOWN_SPELL,GetNameLink(targetPlayer).c_str());
|
||||
SetSentErrorMessage(true);
|
||||
return false;
|
||||
}
|
||||
|
|
@ -1930,7 +1932,7 @@ bool ChatHandler::HandleAddItemCommand(const char* args)
|
|||
if (count < 0)
|
||||
{
|
||||
plTarget->DestroyItemCount(itemId, -count, true, false);
|
||||
PSendSysMessage(LANG_REMOVEITEM, itemId, -count, plTarget->GetName());
|
||||
PSendSysMessage(LANG_REMOVEITEM, itemId, -count, GetNameLink(plTarget).c_str());
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -3396,7 +3398,7 @@ bool ChatHandler::HandleModifyArenaCommand(const char * args)
|
|||
|
||||
target->ModifyArenaPoints(amount);
|
||||
|
||||
PSendSysMessage(LANG_COMMAND_MODIFY_ARENA, target->GetName(), target->GetArenaPoints());
|
||||
PSendSysMessage(LANG_COMMAND_MODIFY_ARENA, GetNameLink(target).c_str(), target->GetArenaPoints());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
@ -3692,15 +3694,15 @@ bool ChatHandler::HandleExploreCheatCommand(const char* args)
|
|||
|
||||
if (flag != 0)
|
||||
{
|
||||
PSendSysMessage(LANG_YOU_SET_EXPLORE_ALL, chr->GetName());
|
||||
PSendSysMessage(LANG_YOU_SET_EXPLORE_ALL, GetNameLink(chr).c_str());
|
||||
if (needReportToTarget(chr))
|
||||
ChatHandler(chr).PSendSysMessage(LANG_YOURS_EXPLORE_SET_ALL,GetName());
|
||||
ChatHandler(chr).PSendSysMessage(LANG_YOURS_EXPLORE_SET_ALL,GetNameLink().c_str());
|
||||
}
|
||||
else
|
||||
{
|
||||
PSendSysMessage(LANG_YOU_SET_EXPLORE_NOTHING, chr->GetName());
|
||||
PSendSysMessage(LANG_YOU_SET_EXPLORE_NOTHING, GetNameLink(chr).c_str());
|
||||
if (needReportToTarget(chr))
|
||||
ChatHandler(chr).PSendSysMessage(LANG_YOURS_EXPLORE_SET_NOTHING,GetName());
|
||||
ChatHandler(chr).PSendSysMessage(LANG_YOURS_EXPLORE_SET_NOTHING,GetNameLink().c_str());
|
||||
}
|
||||
|
||||
for (uint8 i=0; i<128; i++)
|
||||
|
|
@ -3799,7 +3801,7 @@ bool ChatHandler::HandleLevelUpCommand(const char* args)
|
|||
return false;
|
||||
}
|
||||
|
||||
name = chr->GetName();
|
||||
name = GetNameLink(chr);
|
||||
}
|
||||
|
||||
assert(chr || chr_guid);
|
||||
|
|
@ -4508,12 +4510,8 @@ bool ChatHandler::HandleResetSpellsCommand(const char * args)
|
|||
player->resetSpells();
|
||||
|
||||
ChatHandler(player).SendSysMessage(LANG_RESET_SPELLS);
|
||||
|
||||
if(m_session->GetPlayer()!=player)
|
||||
{
|
||||
std::string nameLink = playerLink(player->GetName());
|
||||
PSendSysMessage(LANG_RESET_SPELLS_ONLINE,nameLink.c_str());
|
||||
}
|
||||
PSendSysMessage(LANG_RESET_SPELLS_ONLINE,GetNameLink(player).c_str());
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -4551,12 +4549,9 @@ bool ChatHandler::HandleResetTalentsCommand(const char * args)
|
|||
player->resetTalents(true);
|
||||
|
||||
ChatHandler(player).SendSysMessage(LANG_RESET_TALENTS);
|
||||
|
||||
if(m_session->GetPlayer()!=player)
|
||||
{
|
||||
std::string nameLink = playerLink(player->GetName());
|
||||
PSendSysMessage(LANG_RESET_TALENTS_ONLINE,nameLink.c_str());
|
||||
}
|
||||
PSendSysMessage(LANG_RESET_TALENTS_ONLINE,GetNameLink(player).c_str());
|
||||
|
||||
return true;
|
||||
}
|
||||
else if (playerGUID)
|
||||
|
|
@ -4577,10 +4572,7 @@ bool ChatHandler::HandleResetTalentsCommand(const char * args)
|
|||
player = (Player *)owner;
|
||||
ChatHandler(player).SendSysMessage(LANG_RESET_TALENTS);
|
||||
if(m_session->GetPlayer()!=player)
|
||||
{
|
||||
std::string nameLink = playerLink(player->GetName());
|
||||
PSendSysMessage(LANG_RESET_TALENTS_ONLINE,nameLink.c_str());
|
||||
}
|
||||
PSendSysMessage(LANG_RESET_TALENTS_ONLINE,GetNameLink(player).c_str());
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
@ -5472,9 +5464,9 @@ bool ChatHandler::HandleFlyModeCommand(const char* args)
|
|||
if(!args)
|
||||
return false;
|
||||
|
||||
Unit *unit = getSelectedUnit();
|
||||
if (!unit || (unit->GetTypeId() != TYPEID_PLAYER))
|
||||
unit = m_session->GetPlayer();
|
||||
Player *target = getSelectedPlayer();
|
||||
if (!target)
|
||||
target = m_session->GetPlayer();
|
||||
|
||||
WorldPacket data(12);
|
||||
if (strncmp(args, "on", 3) == 0)
|
||||
|
|
@ -5486,10 +5478,10 @@ bool ChatHandler::HandleFlyModeCommand(const char* args)
|
|||
SendSysMessage(LANG_USE_BOL);
|
||||
return false;
|
||||
}
|
||||
data.append(unit->GetPackGUID());
|
||||
data.append(target->GetPackGUID());
|
||||
data << uint32(0); // unknown
|
||||
unit->SendMessageToSet(&data, true);
|
||||
PSendSysMessage(LANG_COMMAND_FLYMODE_STATUS, unit->GetName(), args);
|
||||
target->SendMessageToSet(&data, true);
|
||||
PSendSysMessage(LANG_COMMAND_FLYMODE_STATUS, GetNameLink(target).c_str(), args);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -6590,10 +6582,10 @@ bool ChatHandler::HandleModifyGenderCommand(const char *args)
|
|||
|
||||
char const* gender_full = gender ? "female" : "male";
|
||||
|
||||
PSendSysMessage(LANG_YOU_CHANGE_GENDER, player->GetName(), gender_full);
|
||||
PSendSysMessage(LANG_YOU_CHANGE_GENDER, GetNameLink(player).c_str(), gender_full);
|
||||
|
||||
if (needReportToTarget(player))
|
||||
ChatHandler(player).PSendSysMessage(LANG_YOUR_GENDER_CHANGED, gender_full, GetName());
|
||||
ChatHandler(player).PSendSysMessage(LANG_YOUR_GENDER_CHANGED, gender_full, GetNameLink().c_str());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue