mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2026-01-15 10:00:28 +00:00
refactor(Core/Chat): PSendSysMessage to fmt (#19449)
* refactor(Core/Chat): PSendSysMessage to `fmt`
This commit is contained in:
@@ -357,43 +357,43 @@ public:
|
||||
switch (error)
|
||||
{
|
||||
case 1:
|
||||
handler->PSendSysMessage("Player %s not found.", last_name.c_str());
|
||||
handler->PSendSysMessage("Player {} not found.", last_name);
|
||||
break;
|
||||
case 2:
|
||||
handler->PSendSysMessage("Player %s is being teleported.", last_name.c_str());
|
||||
handler->PSendSysMessage("Player {} is being teleported.", last_name);
|
||||
break;
|
||||
case 3:
|
||||
handler->PSendSysMessage("Player %s is in instance/battleground/arena.", last_name.c_str());
|
||||
handler->PSendSysMessage("Player {} is in instance/battleground/arena.", last_name);
|
||||
break;
|
||||
case 4:
|
||||
handler->PSendSysMessage("Player %s is in LFG system.", last_name.c_str());
|
||||
handler->PSendSysMessage("Player {} is in LFG system.", last_name);
|
||||
break;
|
||||
case 5:
|
||||
handler->PSendSysMessage("Player %s is queued for battleground/arena.", last_name.c_str());
|
||||
handler->PSendSysMessage("Player {} is queued for battleground/arena.", last_name);
|
||||
break;
|
||||
case 6:
|
||||
handler->PSendSysMessage("Player %s is not in group.", last_name.c_str());
|
||||
handler->PSendSysMessage("Player {} is not in group.", last_name);
|
||||
break;
|
||||
case 7:
|
||||
handler->PSendSysMessage("Player %s is not in normal group.", last_name.c_str());
|
||||
handler->PSendSysMessage("Player {} is not in normal group.", last_name);
|
||||
break;
|
||||
case 8:
|
||||
handler->PSendSysMessage("Group of player %s has invalid member count.", last_name.c_str());
|
||||
handler->PSendSysMessage("Group of player {} has invalid member count.", last_name);
|
||||
break;
|
||||
case 9:
|
||||
handler->PSendSysMessage("Players %s are not in the same group.", last_name.c_str());
|
||||
handler->PSendSysMessage("Players {} are not in the same group.", last_name);
|
||||
break;
|
||||
case 10:
|
||||
handler->PSendSysMessage("Player %s is in flight.", last_name.c_str());
|
||||
handler->PSendSysMessage("Player {} is in flight.", last_name);
|
||||
break;
|
||||
case 11:
|
||||
handler->PSendSysMessage("Player %s is dead.", last_name.c_str());
|
||||
handler->PSendSysMessage("Player {} is dead.", last_name);
|
||||
break;
|
||||
case 12:
|
||||
handler->PSendSysMessage("Player %s is in a group.", last_name.c_str());
|
||||
handler->PSendSysMessage("Player {} is in a group.", last_name);
|
||||
break;
|
||||
case 13:
|
||||
handler->PSendSysMessage("Player %s occurs more than once.", last_name.c_str());
|
||||
handler->PSendSysMessage("Player {} occurs more than once.", last_name);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -724,7 +724,7 @@ public:
|
||||
// only allow if gm mode is on
|
||||
if (!_player->IsGameMaster())
|
||||
{
|
||||
handler->SendErrorMessage(LANG_CANNOT_GO_TO_BG_GM, nameLink.c_str());
|
||||
handler->SendErrorMessage(LANG_CANNOT_GO_TO_BG_GM, nameLink);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -745,7 +745,7 @@ public:
|
||||
// we are in group, we can go only if we are in the player group
|
||||
if (_player->GetGroup() != targetPlayer->GetGroup())
|
||||
{
|
||||
handler->SendErrorMessage(LANG_CANNOT_GO_TO_INST_PARTY, nameLink.c_str());
|
||||
handler->SendErrorMessage(LANG_CANNOT_GO_TO_INST_PARTY, nameLink);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -754,7 +754,7 @@ public:
|
||||
// we are not in group, let's verify our GM mode
|
||||
if (!_player->IsGameMaster())
|
||||
{
|
||||
handler->SendErrorMessage(LANG_CANNOT_GO_TO_INST_GM, nameLink.c_str());
|
||||
handler->SendErrorMessage(LANG_CANNOT_GO_TO_INST_GM, nameLink);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -779,7 +779,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
handler->PSendSysMessage(LANG_APPEARING_AT, nameLink.c_str());
|
||||
handler->PSendSysMessage(LANG_APPEARING_AT, nameLink);
|
||||
|
||||
// stop flight if need
|
||||
if (_player->IsInFlight())
|
||||
@@ -805,7 +805,7 @@ public:
|
||||
return false;
|
||||
}
|
||||
|
||||
handler->PSendSysMessage(LANG_APPEARING_AT, nameLink.c_str());
|
||||
handler->PSendSysMessage(LANG_APPEARING_AT, nameLink);
|
||||
|
||||
// to point where player stay (if loaded)
|
||||
float x, y, z, o;
|
||||
@@ -869,7 +869,7 @@ public:
|
||||
|
||||
if (targetPlayer->IsBeingTeleported())
|
||||
{
|
||||
handler->SendErrorMessage(LANG_IS_TELEPORTED, nameLink.c_str());
|
||||
handler->SendErrorMessage(LANG_IS_TELEPORTED, nameLink);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -906,15 +906,15 @@ public:
|
||||
(handler->GetSession()->GetPlayer()->GetGroup()->GetLeaderGUID() != handler->GetSession()->GetPlayer()->GetGUID()))
|
||||
// the last check is a bit excessive, but let it be, just in case
|
||||
{
|
||||
handler->SendErrorMessage(LANG_CANNOT_SUMMON_TO_INST, nameLink.c_str());
|
||||
handler->SendErrorMessage(LANG_CANNOT_SUMMON_TO_INST, nameLink);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
handler->PSendSysMessage(LANG_SUMMONING, nameLink.c_str(), "");
|
||||
handler->PSendSysMessage(LANG_SUMMONING, nameLink, "");
|
||||
if (handler->needReportToTarget(targetPlayer))
|
||||
{
|
||||
ChatHandler(targetPlayer->GetSession()).PSendSysMessage(LANG_SUMMONED_BY, handler->playerLink(_player->GetName()).c_str());
|
||||
ChatHandler(targetPlayer->GetSession()).PSendSysMessage(LANG_SUMMONED_BY, handler->playerLink(_player->GetName()));
|
||||
}
|
||||
|
||||
// stop flight if need
|
||||
@@ -942,7 +942,7 @@ public:
|
||||
return false;
|
||||
}
|
||||
|
||||
handler->PSendSysMessage(LANG_SUMMONING, nameLink.c_str(), handler->GetAcoreString(LANG_OFFLINE));
|
||||
handler->PSendSysMessage(LANG_SUMMONING, nameLink, handler->GetAcoreString(LANG_OFFLINE));
|
||||
|
||||
// in point where GM stay
|
||||
Player::SavePositionInDB(handler->GetSession()->GetPlayer()->GetMapId(),
|
||||
@@ -984,7 +984,7 @@ public:
|
||||
|
||||
if (!group)
|
||||
{
|
||||
handler->SendErrorMessage(LANG_NOT_IN_GROUP, nameLink.c_str());
|
||||
handler->SendErrorMessage(LANG_NOT_IN_GROUP, nameLink);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1020,7 +1020,7 @@ public:
|
||||
|
||||
if (player->IsBeingTeleported())
|
||||
{
|
||||
handler->SendErrorMessage(LANG_IS_TELEPORTED, plNameLink.c_str());
|
||||
handler->SendErrorMessage(LANG_IS_TELEPORTED, plNameLink);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1031,15 +1031,15 @@ public:
|
||||
if (playerMap->Instanceable() && playerMap->GetInstanceId() != gmMap->GetInstanceId())
|
||||
{
|
||||
// cannot summon from instance to instance
|
||||
handler->SendErrorMessage(LANG_CANNOT_SUMMON_TO_INST, plNameLink.c_str());
|
||||
handler->SendErrorMessage(LANG_CANNOT_SUMMON_TO_INST, plNameLink);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
handler->PSendSysMessage(LANG_SUMMONING, plNameLink.c_str(), "");
|
||||
handler->PSendSysMessage(LANG_SUMMONING, plNameLink, "");
|
||||
if (handler->needReportToTarget(player))
|
||||
{
|
||||
ChatHandler(player->GetSession()).PSendSysMessage(LANG_SUMMONED_BY, handler->GetNameLink().c_str());
|
||||
ChatHandler(player->GetSession()).PSendSysMessage(LANG_SUMMONED_BY, handler->GetNameLink());
|
||||
}
|
||||
|
||||
// stop flight if need
|
||||
@@ -1169,7 +1169,7 @@ public:
|
||||
return false;
|
||||
}
|
||||
|
||||
handler->PSendSysMessage(LANG_OBJECT_GUID, guid.ToString().c_str());
|
||||
handler->PSendSysMessage(LANG_OBJECT_GUID, guid.ToString());
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1199,7 +1199,7 @@ public:
|
||||
if (!spell)
|
||||
{
|
||||
target->RemoveAllSpellCooldown();
|
||||
handler->PSendSysMessage(LANG_REMOVEALL_COOLDOWN, nameLink.c_str());
|
||||
handler->PSendSysMessage(LANG_REMOVEALL_COOLDOWN, nameLink);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1210,7 +1210,7 @@ public:
|
||||
}
|
||||
|
||||
target->RemoveSpellCooldown(spell.value()->Id, true);
|
||||
handler->PSendSysMessage(LANG_REMOVE_COOLDOWN, spell.value()->Id, target == handler->GetSession()->GetPlayer() ? handler->GetAcoreString(LANG_YOU) : nameLink.c_str());
|
||||
handler->PSendSysMessage(LANG_REMOVE_COOLDOWN, spell.value()->Id, target == handler->GetSession()->GetPlayer() ? handler->GetAcoreString(LANG_YOU) : nameLink);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -1265,7 +1265,7 @@ public:
|
||||
|
||||
if (targetPlayer->IsBeingTeleported())
|
||||
{
|
||||
handler->SendErrorMessage(LANG_IS_TELEPORTED, handler->playerLink(target->GetName()).c_str());
|
||||
handler->SendErrorMessage(LANG_IS_TELEPORTED, handler->playerLink(target->GetName()));
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1357,7 +1357,7 @@ public:
|
||||
}
|
||||
else
|
||||
{
|
||||
handler->PSendSysMessage(LANG_COMMAND_KICKMESSAGE, target->GetName().c_str());
|
||||
handler->PSendSysMessage(LANG_COMMAND_KICKMESSAGE, target->GetName());
|
||||
}
|
||||
|
||||
targetPlayer->GetSession()->KickPlayer("HandleKickPlayerCommand");
|
||||
@@ -1550,7 +1550,7 @@ public:
|
||||
team_name = handler->GetAcoreString(LANG_COMMAND_GRAVEYARD_ALLIANCE);
|
||||
}
|
||||
|
||||
handler->PSendSysMessage(LANG_COMMAND_GRAVEYARDNEAREST, graveyardId, team_name.c_str(), zone_id);
|
||||
handler->PSendSysMessage(LANG_COMMAND_GRAVEYARDNEAREST, graveyardId, team_name, zone_id);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1569,7 +1569,7 @@ public:
|
||||
team_name = handler->GetAcoreString(LANG_COMMAND_GRAVEYARD_ALLIANCE);
|
||||
}
|
||||
|
||||
handler->PSendSysMessage(LANG_COMMAND_ZONENOGRAFACTION, zone_id, team_name.c_str());
|
||||
handler->PSendSysMessage(LANG_COMMAND_ZONENOGRAFACTION, zone_id, team_name);
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -1674,21 +1674,21 @@ public:
|
||||
if (!playerTarget->HasItemCount(itemId, 0))
|
||||
{
|
||||
// output that player don't have any items to destroy
|
||||
handler->SendErrorMessage(LANG_REMOVEITEM_FAILURE, handler->GetNameLink(playerTarget).c_str(), itemId);
|
||||
handler->SendErrorMessage(LANG_REMOVEITEM_FAILURE, handler->GetNameLink(playerTarget), itemId);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!playerTarget->HasItemCount(itemId, -count))
|
||||
{
|
||||
// output that player don't have as many items that you want to destroy
|
||||
handler->SendErrorMessage(LANG_REMOVEITEM_ERROR, handler->GetNameLink(playerTarget).c_str(), itemId);
|
||||
handler->SendErrorMessage(LANG_REMOVEITEM_ERROR, handler->GetNameLink(playerTarget), itemId);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// output successful amount of destroyed items
|
||||
playerTarget->DestroyItemCount(itemId, -count, true, false);
|
||||
handler->PSendSysMessage(LANG_REMOVEITEM, itemId, -count, handler->GetNameLink(playerTarget).c_str());
|
||||
handler->PSendSysMessage(LANG_REMOVEITEM, itemId, -count, handler->GetNameLink(playerTarget));
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1883,7 +1883,7 @@ public:
|
||||
// add the skill to the player's book with step 1 (which is the first rank, in most cases something
|
||||
// like 'Apprentice <skill>'.
|
||||
target->SetSkill(skillID, targetHasSkill ? target->GetSkillStep(skillID) : 1, level, max);
|
||||
handler->PSendSysMessage(LANG_SET_SKILL, skillID, skillLine->name[handler->GetSessionDbcLocale()], handler->GetNameLink(target).c_str(), level, max);
|
||||
handler->PSendSysMessage(LANG_SET_SKILL, skillID, skillLine->name[handler->GetSessionDbcLocale()], handler->GetNameLink(target), level, max);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -2131,7 +2131,7 @@ public:
|
||||
|
||||
// Initiate output
|
||||
// Output I. LANG_PINFO_PLAYER
|
||||
handler->PSendSysMessage(LANG_PINFO_PLAYER, playerTarget ? "" : handler->GetAcoreString(LANG_OFFLINE), nameLink.c_str(), target->GetGUID().GetCounter());
|
||||
handler->PSendSysMessage(LANG_PINFO_PLAYER, playerTarget ? "" : handler->GetAcoreString(LANG_OFFLINE), nameLink, target->GetGUID().ToString());
|
||||
|
||||
// Output II. LANG_PINFO_GM_ACTIVE if character is gamemaster
|
||||
if (playerTarget && playerTarget->IsGameMaster())
|
||||
@@ -2142,29 +2142,29 @@ public:
|
||||
// Output III. LANG_PINFO_BANNED if ban exists and is applied
|
||||
if (banTime >= 0)
|
||||
{
|
||||
handler->PSendSysMessage(LANG_PINFO_BANNED, banType.c_str(), banReason.c_str(), banTime > 0 ? secsToTimeString(banTime - GameTime::GetGameTime().count(), true).c_str() : handler->GetAcoreString(LANG_PERMANENTLY), bannedBy.c_str());
|
||||
handler->PSendSysMessage(LANG_PINFO_BANNED, banType, banReason, banTime > 0 ? secsToTimeString(banTime - GameTime::GetGameTime().count(), true) : handler->GetAcoreString(LANG_PERMANENTLY), bannedBy);
|
||||
}
|
||||
|
||||
// Output IV. LANG_PINFO_MUTED if mute is applied
|
||||
if (muteTime > 0)
|
||||
{
|
||||
handler->PSendSysMessage(LANG_PINFO_MUTED, muteReason.c_str(), secsToTimeString(muteTime - GameTime::GetGameTime().count(), true).c_str(), muteBy.c_str());
|
||||
handler->PSendSysMessage(LANG_PINFO_MUTED, muteReason, secsToTimeString(muteTime - GameTime::GetGameTime().count(), true), muteBy);
|
||||
}
|
||||
|
||||
// Output V. LANG_PINFO_ACC_ACCOUNT
|
||||
handler->PSendSysMessage(LANG_PINFO_ACC_ACCOUNT, userName.c_str(), accId, security);
|
||||
handler->PSendSysMessage(LANG_PINFO_ACC_ACCOUNT, userName, accId, security);
|
||||
|
||||
// Output VI. LANG_PINFO_ACC_LASTLOGIN
|
||||
handler->PSendSysMessage(LANG_PINFO_ACC_LASTLOGIN, lastLogin.c_str(), failedLogins);
|
||||
handler->PSendSysMessage(LANG_PINFO_ACC_LASTLOGIN, lastLogin, failedLogins);
|
||||
|
||||
// Output VII. LANG_PINFO_ACC_OS
|
||||
handler->PSendSysMessage(LANG_PINFO_ACC_OS, OS.c_str(), latency);
|
||||
handler->PSendSysMessage(LANG_PINFO_ACC_OS, OS, latency);
|
||||
|
||||
// Output VIII. LANG_PINFO_ACC_REGMAILS
|
||||
handler->PSendSysMessage(LANG_PINFO_ACC_REGMAILS, regMail.c_str(), eMail.c_str());
|
||||
handler->PSendSysMessage(LANG_PINFO_ACC_REGMAILS, regMail, eMail);
|
||||
|
||||
// Output IX. LANG_PINFO_ACC_IP
|
||||
handler->PSendSysMessage(LANG_PINFO_ACC_IP, lastIp.c_str(), locked ? handler->GetAcoreString(LANG_YES) : handler->GetAcoreString(LANG_NO));
|
||||
handler->PSendSysMessage(LANG_PINFO_ACC_IP, lastIp, locked ? handler->GetAcoreString(LANG_YES) : handler->GetAcoreString(LANG_NO));
|
||||
|
||||
// Output X. LANG_PINFO_CHR_LEVEL
|
||||
if (level != sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL))
|
||||
@@ -2245,10 +2245,10 @@ public:
|
||||
break;
|
||||
}
|
||||
|
||||
handler->PSendSysMessage(LANG_PINFO_CHR_RACE, (gender == 0 ? handler->GetAcoreString(LANG_CHARACTER_GENDER_MALE) : handler->GetAcoreString(LANG_CHARACTER_GENDER_FEMALE)), raceStr.c_str(), classStr.c_str());
|
||||
handler->PSendSysMessage(LANG_PINFO_CHR_RACE, (gender == 0 ? handler->GetAcoreString(LANG_CHARACTER_GENDER_MALE) : handler->GetAcoreString(LANG_CHARACTER_GENDER_FEMALE)), raceStr, classStr);
|
||||
|
||||
// Output XII. LANG_PINFO_CHR_ALIVE
|
||||
handler->PSendSysMessage(LANG_PINFO_CHR_ALIVE, alive.c_str());
|
||||
handler->PSendSysMessage(LANG_PINFO_CHR_ALIVE, alive);
|
||||
|
||||
// Output XIII. LANG_PINFO_CHR_PHASE if player is not in GM mode (GM is in every phase)
|
||||
if (playerTarget && !playerTarget->IsGameMaster()) // IsInWorld() returns false on loadingscreen, so it's more
|
||||
@@ -2296,22 +2296,22 @@ public:
|
||||
// Output XVII. - XVIX. if they are not empty
|
||||
if (!guildName.empty())
|
||||
{
|
||||
handler->PSendSysMessage(LANG_PINFO_CHR_GUILD, guildName.c_str(), guildId);
|
||||
handler->PSendSysMessage(LANG_PINFO_CHR_GUILD_RANK, guildRank.c_str(), uint32(guildRankId));
|
||||
handler->PSendSysMessage(LANG_PINFO_CHR_GUILD, guildName, guildId);
|
||||
handler->PSendSysMessage(LANG_PINFO_CHR_GUILD_RANK, guildRank, uint32(guildRankId));
|
||||
|
||||
if (!note.empty())
|
||||
{
|
||||
handler->PSendSysMessage(LANG_PINFO_CHR_GUILD_NOTE, note.c_str());
|
||||
handler->PSendSysMessage(LANG_PINFO_CHR_GUILD_NOTE, note);
|
||||
}
|
||||
|
||||
if (!officeNote.empty())
|
||||
{
|
||||
handler->PSendSysMessage(LANG_PINFO_CHR_GUILD_ONOTE, officeNote.c_str());
|
||||
handler->PSendSysMessage(LANG_PINFO_CHR_GUILD_ONOTE, officeNote);
|
||||
}
|
||||
}
|
||||
|
||||
// Output XX. LANG_PINFO_CHR_PLAYEDTIME
|
||||
handler->PSendSysMessage(LANG_PINFO_CHR_PLAYEDTIME, (secsToTimeString(totalPlayerTime, true)).c_str());
|
||||
handler->PSendSysMessage(LANG_PINFO_CHR_PLAYEDTIME, (secsToTimeString(totalPlayerTime, true)));
|
||||
|
||||
// Mail Data - an own query, because it may or may not be useful.
|
||||
// SQL: "SELECT SUM(CASE WHEN (checked & 1) THEN 1 ELSE 0 END) AS 'readmail', COUNT(*) AS 'totalmail' FROM mail WHERE `receiver` = ?"
|
||||
@@ -2458,7 +2458,7 @@ public:
|
||||
sWorld->SendWorldText(LANG_COMMAND_MUTEMESSAGE_WORLD, muteBy.c_str(), nameLink.c_str(), secsToTimeString(muteDuration, true).c_str(), muteReasonStr.c_str());
|
||||
}
|
||||
|
||||
ChatHandler(target->GetSession()).PSendSysMessage(LANG_YOUR_CHAT_DISABLED, secsToTimeString(muteDuration, true).c_str(), muteBy.c_str(), muteReasonStr.c_str());
|
||||
ChatHandler(target->GetSession()).PSendSysMessage(LANG_YOUR_CHAT_DISABLED, secsToTimeString(muteDuration, true), muteBy, muteReasonStr);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2492,7 +2492,7 @@ public:
|
||||
for (HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr)
|
||||
if (itr->second->GetSession()->GetSecurity())
|
||||
ChatHandler(itr->second->GetSession()).PSendSysMessage(target ? LANG_YOU_DISABLE_CHAT : LANG_COMMAND_DISABLE_CHAT_DELAYED,
|
||||
(handler->GetSession() ? handler->GetSession()->GetPlayerName().c_str() : handler->GetAcoreString(LANG_CONSOLE)), nameLink.c_str(), secsToTimeString(muteDuration, true).c_str(), muteReasonStr.c_str());
|
||||
(handler->GetSession() ? handler->GetSession()->GetPlayerName() : handler->GetAcoreString(LANG_CONSOLE)), nameLink, secsToTimeString(muteDuration, true), muteReasonStr);
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -2552,7 +2552,7 @@ public:
|
||||
ChatHandler(playerTarget->GetSession()).PSendSysMessage(LANG_YOUR_CHAT_ENABLED);
|
||||
}
|
||||
|
||||
handler->PSendSysMessage(LANG_YOU_ENABLE_CHAT, handler->playerLink(target->GetName().c_str()));
|
||||
handler->PSendSysMessage(LANG_YOU_ENABLE_CHAT, handler->playerLink(target->GetName()));
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -2562,14 +2562,14 @@ public:
|
||||
{
|
||||
if (!Utf8ToUpperOnlyLatin(accountName))
|
||||
{
|
||||
handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
|
||||
handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, accountName);
|
||||
return false;
|
||||
}
|
||||
|
||||
uint32 accountId = AccountMgr::GetId(accountName);
|
||||
if (!accountId)
|
||||
{
|
||||
handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
|
||||
handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -2593,7 +2593,7 @@ public:
|
||||
do
|
||||
{
|
||||
Field* fields = result->Fetch();
|
||||
handler->PSendSysMessage(LANG_COMMAND_MUTEHISTORY_OUTPUT, Acore::Time::TimeToHumanReadable(Seconds(fields[0].Get<uint32>())).c_str(), fields[1].Get<uint32>(), fields[2].Get<std::string>().c_str(), fields[3].Get<std::string>().c_str());
|
||||
handler->PSendSysMessage(LANG_COMMAND_MUTEHISTORY_OUTPUT, Acore::Time::TimeToHumanReadable(Seconds(fields[0].Get<uint32>())), fields[1].Get<uint32>(), fields[2].Get<std::string>(), fields[3].Get<std::string>());
|
||||
} while (result->NextRow());
|
||||
|
||||
return true;
|
||||
@@ -2608,7 +2608,7 @@ public:
|
||||
return false;
|
||||
}
|
||||
|
||||
handler->PSendSysMessage(LANG_MOVEGENS_LIST, (unit->GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"), unit->GetGUID().GetCounter());
|
||||
handler->PSendSysMessage(LANG_MOVEGENS_LIST, (unit->GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"), unit->GetGUID().ToString());
|
||||
|
||||
MotionMaster* motionMaster = unit->GetMotionMaster();
|
||||
float x, y, z;
|
||||
@@ -2658,11 +2658,11 @@ public:
|
||||
}
|
||||
else if (target->GetTypeId() == TYPEID_PLAYER)
|
||||
{
|
||||
handler->PSendSysMessage(LANG_MOVEGENS_CHASE_PLAYER, target->GetName().c_str(), target->GetGUID().GetCounter());
|
||||
handler->PSendSysMessage(LANG_MOVEGENS_CHASE_PLAYER, target->GetName(), target->GetGUID().ToString());
|
||||
}
|
||||
else
|
||||
{
|
||||
handler->PSendSysMessage(LANG_MOVEGENS_CHASE_CREATURE, target->GetName().c_str(), target->GetGUID().GetCounter());
|
||||
handler->PSendSysMessage(LANG_MOVEGENS_CHASE_CREATURE, target->GetName(), target->GetGUID().ToString());
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -2684,11 +2684,11 @@ public:
|
||||
}
|
||||
else if (target->GetTypeId() == TYPEID_PLAYER)
|
||||
{
|
||||
handler->PSendSysMessage(LANG_MOVEGENS_FOLLOW_PLAYER, target->GetName().c_str(), target->GetGUID().GetCounter());
|
||||
handler->PSendSysMessage(LANG_MOVEGENS_FOLLOW_PLAYER, target->GetName(), target->GetGUID().ToString());
|
||||
}
|
||||
else
|
||||
{
|
||||
handler->PSendSysMessage(LANG_MOVEGENS_FOLLOW_CREATURE, target->GetName().c_str(), target->GetGUID().GetCounter());
|
||||
handler->PSendSysMessage(LANG_MOVEGENS_FOLLOW_CREATURE, target->GetName(), target->GetGUID().ToString());
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -2841,7 +2841,7 @@ public:
|
||||
Player* playerTarget = target->GetConnectedPlayer();
|
||||
if (playerTarget && !creatureTarget)
|
||||
{
|
||||
handler->PSendSysMessage(LANG_COMMAND_FREEZE, target->GetName().c_str());
|
||||
handler->PSendSysMessage(LANG_COMMAND_FREEZE, target->GetName());
|
||||
|
||||
if (SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(SPELL_FREEZE))
|
||||
{
|
||||
@@ -2852,7 +2852,7 @@ public:
|
||||
}
|
||||
else if (creatureTarget && creatureTarget->IsAlive())
|
||||
{
|
||||
handler->PSendSysMessage(LANG_COMMAND_FREEZE, GetLocalizeCreatureName(creatureTarget, handler->GetSessionDbcLocale()).c_str());
|
||||
handler->PSendSysMessage(LANG_COMMAND_FREEZE, GetLocalizeCreatureName(creatureTarget, handler->GetSessionDbcLocale()));
|
||||
|
||||
if (SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(SPELL_FREEZE))
|
||||
{
|
||||
@@ -2885,13 +2885,13 @@ public:
|
||||
|
||||
if (!creatureTarget && playerTarget && playerTarget->HasAura(SPELL_FREEZE))
|
||||
{
|
||||
handler->PSendSysMessage(LANG_COMMAND_UNFREEZE, target->GetName().c_str());
|
||||
handler->PSendSysMessage(LANG_COMMAND_UNFREEZE, target->GetName());
|
||||
playerTarget->RemoveAurasDueToSpell(SPELL_FREEZE);
|
||||
return true;
|
||||
}
|
||||
else if (creatureTarget && creatureTarget->HasAura(SPELL_FREEZE))
|
||||
{
|
||||
handler->PSendSysMessage(LANG_COMMAND_UNFREEZE, GetLocalizeCreatureName(creatureTarget, handler->GetSessionDbcLocale()).c_str());
|
||||
handler->PSendSysMessage(LANG_COMMAND_UNFREEZE, GetLocalizeCreatureName(creatureTarget, handler->GetSessionDbcLocale()));
|
||||
creatureTarget->RemoveAurasDueToSpell(SPELL_FREEZE);
|
||||
return true;
|
||||
}
|
||||
@@ -2900,7 +2900,7 @@ public:
|
||||
CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CHAR_AURA_FROZEN);
|
||||
stmt->SetData(0, target->GetGUID().GetCounter());
|
||||
CharacterDatabase.Execute(stmt);
|
||||
handler->PSendSysMessage(LANG_COMMAND_UNFREEZE, target->GetName().c_str());
|
||||
handler->PSendSysMessage(LANG_COMMAND_UNFREEZE, target->GetName());
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user