refactor(Core/Chat): PSendSysMessage to fmt (#19449)

* refactor(Core/Chat): PSendSysMessage to `fmt`
This commit is contained in:
Kitzunu
2024-07-23 23:48:46 +02:00
committed by GitHub
parent e79c89aeb1
commit 3fbded8f6b
52 changed files with 801 additions and 587 deletions

View File

@@ -58,7 +58,7 @@ public:
{
if (sArenaTeamMgr->GetArenaTeamByName(name))
{
handler->SendErrorMessage(LANG_ARENA_ERROR_NAME_EXISTS, name.c_str());
handler->SendErrorMessage(LANG_ARENA_ERROR_NAME_EXISTS, name);
return false;
}
@@ -70,7 +70,7 @@ public:
if (Player::GetArenaTeamIdFromDB(captain->GetGUID(), type) != 0)
{
handler->SendErrorMessage(LANG_ARENA_ERROR_SIZE, captain->GetName().c_str());
handler->SendErrorMessage(LANG_ARENA_ERROR_SIZE, captain->GetName());
return false;
}
@@ -84,7 +84,7 @@ public:
}
sArenaTeamMgr->AddArenaTeam(arena);
handler->PSendSysMessage(LANG_ARENA_CREATE, arena->GetName().c_str(), arena->GetId(), arena->GetType(), arena->GetCaptain().GetCounter());
handler->PSendSysMessage(LANG_ARENA_CREATE, arena->GetName(), arena->GetId(), arena->GetType(), arena->GetCaptain().ToString());
return true;
}
@@ -110,7 +110,7 @@ public:
delete(arena);
handler->PSendSysMessage(LANG_ARENA_DISBAND, name.c_str(), teamId);
handler->PSendSysMessage(LANG_ARENA_DISBAND, name, teamId);
return true;
}
@@ -119,13 +119,13 @@ public:
ArenaTeam* arena = sArenaTeamMgr->GetArenaTeamByName(oldName);
if (!arena)
{
handler->SendErrorMessage(LANG_ARENA_ERROR_NAME_NOT_FOUND, oldName.c_str());
handler->SendErrorMessage(LANG_ARENA_ERROR_NAME_NOT_FOUND, oldName);
return false;
}
if (sArenaTeamMgr->GetArenaTeamByName(newName))
{
handler->SendErrorMessage(LANG_ARENA_ERROR_NAME_EXISTS, oldName.c_str());
handler->SendErrorMessage(LANG_ARENA_ERROR_NAME_EXISTS, oldName);
return false;
}
@@ -141,7 +141,7 @@ public:
return false;
}
handler->PSendSysMessage(LANG_ARENA_RENAME, arena->GetId(), oldName.c_str(), newName.c_str());
handler->PSendSysMessage(LANG_ARENA_RENAME, arena->GetId(), oldName, newName);
return true;
}
@@ -169,13 +169,13 @@ public:
if (!arena->IsMember(target->GetGUID()))
{
handler->SendErrorMessage(LANG_ARENA_ERROR_NOT_MEMBER, target->GetName().c_str(), arena->GetName().c_str());
handler->SendErrorMessage(LANG_ARENA_ERROR_NOT_MEMBER, target->GetName(), arena->GetName());
return false;
}
if (arena->GetCaptain() == target->GetGUID())
{
handler->SendErrorMessage(LANG_ARENA_ERROR_CAPTAIN, target->GetName().c_str(), arena->GetName().c_str());
handler->SendErrorMessage(LANG_ARENA_ERROR_CAPTAIN, target->GetName(), arena->GetName());
return false;
}
@@ -183,7 +183,7 @@ public:
sCharacterCache->GetCharacterNameByGuid(arena->GetCaptain(), oldCaptainName);
arena->SetCaptain(target->GetGUID());
handler->PSendSysMessage(LANG_ARENA_CAPTAIN, arena->GetName().c_str(), arena->GetId(), oldCaptainName.c_str(), target->GetName().c_str());
handler->PSendSysMessage(LANG_ARENA_CAPTAIN, arena->GetName(), arena->GetId(), oldCaptainName, target->GetName());
return true;
}
@@ -197,10 +197,10 @@ public:
return false;
}
handler->PSendSysMessage(LANG_ARENA_INFO_HEADER, arena->GetName().c_str(), arena->GetId(), arena->GetRating(), arena->GetType(), arena->GetType());
handler->PSendSysMessage(LANG_ARENA_INFO_HEADER, arena->GetName(), arena->GetId(), arena->GetRating(), arena->GetType(), arena->GetType());
for (auto const& itr : arena->GetMembers())
handler->PSendSysMessage(LANG_ARENA_INFO_MEMBERS, itr.Name.c_str(), itr.Guid.GetCounter(), itr.PersonalRating, (arena->GetCaptain() == itr.Guid ? "- Captain" : ""));
handler->PSendSysMessage(LANG_ARENA_INFO_MEMBERS, itr.Name, itr.Guid.ToString(), itr.PersonalRating, (arena->GetCaptain() == itr.Guid ? "- Captain" : ""));
return true;
}
@@ -217,7 +217,7 @@ public:
{
if (handler->GetSession())
{
handler->PSendSysMessage(LANG_ARENA_LOOKUP, team->GetName().c_str(), team->GetId(), team->GetType(), team->GetType());
handler->PSendSysMessage(LANG_ARENA_LOOKUP, team->GetName(), team->GetId(), team->GetType(), team->GetType());
found = true;
continue;
}
@@ -225,7 +225,7 @@ public:
}
if (!found)
handler->PSendSysMessage(LANG_ARENA_ERROR_NAME_NOT_FOUND, std::string(needle).c_str());
handler->PSendSysMessage(LANG_ARENA_ERROR_NAME_NOT_FOUND, std::string(needle));
return true;
}