Skip to content

Commit 12f981f

Browse files
authored
Core/Misc: More fixes in preparation to fmt v10 (#31618)
1 parent 67107c6 commit 12f981f

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

src/server/game/Handlers/GuildHandler.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void WorldSession::HandleGuildCreateOpcode(WorldPackets::Guild::GuildCreate& pac
4242

4343
void WorldSession::HandleGuildInviteOpcode(WorldPackets::Guild::GuildInviteByName& packet)
4444
{
45-
TC_LOG_DEBUG("guild", "CMSG_GUILD_INVITE [{}]: Invited: {}", GetPlayerInfo(), packet.Name);
45+
TC_LOG_DEBUG("guild", "CMSG_GUILD_INVITE [{}]: Invited: {}", GetPlayerInfo(), std::string_view(packet.Name));
4646
if (normalizePlayerName(packet.Name))
4747
if (Guild* guild = GetPlayer()->GetGuild())
4848
guild->HandleInviteMember(this, packet.Name);
@@ -148,7 +148,7 @@ void WorldSession::HandleGuildSetPublicNoteOpcode(WorldPackets::Guild::GuildSetM
148148
void WorldSession::HandleGuildSetOfficerNoteOpcode(WorldPackets::Guild::GuildSetMemberNote& packet)
149149
{
150150
TC_LOG_DEBUG("guild", "CMSG_GUILD_SET_OFFICER_NOTE [{}]: Target: {}, Note: {}",
151-
GetPlayerInfo(), packet.NoteeName, packet.Note);
151+
GetPlayerInfo(), std::string_view(packet.NoteeName), std::string_view(packet.Note));
152152

153153
if (normalizePlayerName(packet.NoteeName))
154154
if (Guild* guild = GetPlayer()->GetGuild())

src/server/game/Handlers/MailHandler.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void WorldSession::HandleSendMail(WorldPackets::Mail::SendMail& sendMail)
8383
{
8484
TC_LOG_INFO("network", "Player {} is sending mail to {} (GUID: non-existing!) with subject {} "
8585
"and body {} includes {} items, {} copper and {} COD copper with StationeryID = {}, PackageID = {}",
86-
GetPlayerInfo(), sendMail.Info.Target, sendMail.Info.Subject, sendMail.Info.Body,
86+
GetPlayerInfo(), sendMail.Info.Target, std::string_view(sendMail.Info.Subject), std::string_view(sendMail.Info.Body),
8787
sendMail.Info.Attachments.size(), sendMail.Info.SendMoney, sendMail.Info.Cod, sendMail.Info.StationeryID, sendMail.Info.PackageID);
8888
player->SendMailResult(0, MAIL_SEND, MAIL_ERR_RECIPIENT_NOT_FOUND);
8989
return;
@@ -107,8 +107,8 @@ void WorldSession::HandleSendMail(WorldPackets::Mail::SendMail& sendMail)
107107

108108
TC_LOG_INFO("network", "Player {} is sending mail to {} ({}) with subject {} and body {} "
109109
"including {} items, {} copper and {} COD copper with StationeryID = {}, PackageID = {}",
110-
GetPlayerInfo(), sendMail.Info.Target, receiverGuid.ToString(), sendMail.Info.Subject,
111-
sendMail.Info.Body, sendMail.Info.Attachments.size(), sendMail.Info.SendMoney, sendMail.Info.Cod, sendMail.Info.StationeryID, sendMail.Info.PackageID);
110+
GetPlayerInfo(), sendMail.Info.Target, receiverGuid.ToString(), std::string_view(sendMail.Info.Subject),
111+
std::string_view(sendMail.Info.Body), sendMail.Info.Attachments.size(), sendMail.Info.SendMoney, sendMail.Info.Cod, sendMail.Info.StationeryID, sendMail.Info.PackageID);
112112

113113
if (player->GetGUID() == receiverGuid)
114114
{

src/server/scripts/Commands/cs_gobject.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class gobject_commandscript : public CommandScript
8585
GameObject* object = handler->GetObjectFromPlayerMapByDbGuid(guidLow);
8686
if (!object)
8787
{
88-
handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, guidLow);
88+
handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, *guidLow);
8989
handler->SetSentErrorMessage(true);
9090
return false;
9191
}
@@ -318,12 +318,12 @@ class gobject_commandscript : public CommandScript
318318

319319
if (GameObject::DeleteFromDB(spawnId))
320320
{
321-
handler->PSendSysMessage(LANG_COMMAND_DELOBJMESSAGE, spawnId);
321+
handler->PSendSysMessage(LANG_COMMAND_DELOBJMESSAGE, *spawnId);
322322
return true;
323323
}
324324
else
325325
{
326-
handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, spawnId);
326+
handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, *spawnId);
327327
handler->SetSentErrorMessage(true);
328328
return false;
329329
}
@@ -338,7 +338,7 @@ class gobject_commandscript : public CommandScript
338338
GameObject* object = handler->GetObjectFromPlayerMapByDbGuid(guidLow);
339339
if (!object)
340340
{
341-
handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, guidLow);
341+
handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, *guidLow);
342342
handler->SetSentErrorMessage(true);
343343
return false;
344344
}
@@ -377,7 +377,7 @@ class gobject_commandscript : public CommandScript
377377
GameObject* object = handler->GetObjectFromPlayerMapByDbGuid(guidLow);
378378
if (!object)
379379
{
380-
handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, guidLow);
380+
handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, *guidLow);
381381
handler->SetSentErrorMessage(true);
382382
return false;
383383
}
@@ -434,7 +434,7 @@ class gobject_commandscript : public CommandScript
434434
GameObject* object = handler->GetObjectFromPlayerMapByDbGuid(guidLow);
435435
if (!object)
436436
{
437-
handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, guidLow);
437+
handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, *guidLow);
438438
handler->SetSentErrorMessage(true);
439439
return false;
440440
}
@@ -591,7 +591,7 @@ class gobject_commandscript : public CommandScript
591591
GameObject* object = handler->GetObjectFromPlayerMapByDbGuid(guidLow);
592592
if (!object)
593593
{
594-
handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, guidLow);
594+
handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, *guidLow);
595595
handler->SetSentErrorMessage(true);
596596
return false;
597597
}

src/server/scripts/Commands/cs_npc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ class npc_commandscript : public CommandScript
208208
CreatureData const* data = sObjectMgr->GetCreatureData(lowGuid);
209209
if (!data)
210210
{
211-
handler->PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, lowGuid);
211+
handler->PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, *lowGuid);
212212
handler->SetSentErrorMessage(true);
213213
return false;
214214
}

0 commit comments

Comments
 (0)