diff options
| author | Shauren <shauren.trinity@gmail.com> | 2023-08-17 11:15:15 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2023-08-17 11:15:15 +0200 |
| commit | deec17d8ec82d436efc69680ae781e0de58b605c (patch) | |
| tree | 09fc00406ccbb0722b580f0c890f132f1d24c6ba /src/server | |
| parent | 26836f865511f0f6a48c930264537637eb313cd4 (diff) | |
Core/Logging: Fixed a few missed log format statements
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/game/AuctionHouse/AuctionHouseMgr.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Chat/ChatCommands/ChatCommand.cpp | 10 | ||||
| -rw-r--r-- | src/server/game/Guilds/Guild.cpp | 12 | ||||
| -rw-r--r-- | src/server/game/Handlers/AuctionHouseHandler.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Handlers/MailHandler.cpp | 16 | ||||
| -rw-r--r-- | src/server/game/Handlers/TradeHandler.cpp | 28 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 24 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_character.cpp | 8 |
8 files changed, 55 insertions, 55 deletions
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index 29302a3264b..a05e4a0b5b1 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -155,8 +155,8 @@ void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry* auction, CharacterDatabas uint32 ownerAccId = sCharacterCache->GetCharacterAccountIdByGuid(ownerGuid); - sLog->OutCommand(bidderAccId, "GM %s (Account: %u) won item in auction: %s (Entry: %u Count: %u) and pay money: %u. Original owner %s (Account: %u)", - bidderName.c_str(), bidderAccId, pItem->GetTemplate()->Name1.c_str(), pItem->GetEntry(), pItem->GetCount(), auction->bid, ownerName.c_str(), ownerAccId); + sLog->OutCommand(bidderAccId, "GM {} (Account: {}) won item in auction: {} (Entry: {} Count: {}) and pay money: {}. Original owner {} (Account: {})", + bidderName, bidderAccId, pItem->GetTemplate()->Name1, pItem->GetEntry(), pItem->GetCount(), auction->bid, ownerName, ownerAccId); } // receiver exist diff --git a/src/server/game/Chat/ChatCommands/ChatCommand.cpp b/src/server/game/Chat/ChatCommands/ChatCommand.cpp index dc376545bc9..25b0fd58224 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommand.cpp +++ b/src/server/game/Chat/ChatCommands/ChatCommand.cpp @@ -156,14 +156,14 @@ static void LogCommandUsage(WorldSession const& session, uint32 permission, std: zoneName = zone->AreaName[locale]; } - sLog->OutCommand(session.GetAccountId(), "Command: {} [Player: %s (%s) (Account: %u) X: %f Y: %f Z: %f Map: %u (%s) Area: %u (%s) Zone: %s Selected: %s (%s)]", - cmdStr, player->GetName().c_str(), player->GetGUID().ToString().c_str(), + sLog->OutCommand(session.GetAccountId(), "Command: {} [Player: {} ({}) (Account: {}) X: {} Y: {} Z: {} Map: {} ({}) Area: {} ({}) Zone: {} Selected: {} ({})]", + cmdStr, player->GetName(), player->GetGUID().ToString(), session.GetAccountId(), player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), player->FindMap() ? player->FindMap()->GetMapName() : "Unknown", - areaId, areaName.c_str(), zoneName.c_str(), - (player->GetSelectedUnit()) ? player->GetSelectedUnit()->GetName().c_str() : "", - targetGuid.ToString().c_str()); + areaId, areaName, zoneName, + (player->GetSelectedUnit()) ? player->GetSelectedUnit()->GetName() : "", + targetGuid.ToString()); } void Trinity::Impl::ChatCommands::ChatCommandNode::SendCommandHelp(ChatHandler& handler) const diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index ebc29e1e5d1..672f5888ec1 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -937,10 +937,10 @@ void Guild::BankMoveItemData::LogAction(MoveItemData* pFrom) const if (!pFrom->IsBank() && m_pPlayer->GetSession()->HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE)) /// @todo Move this to scripts { sLog->OutCommand(m_pPlayer->GetSession()->GetAccountId(), - "GM %s (Guid: %u) (Account: %u) deposit item: %s (Entry: %d Count: %u) to guild bank named: %s (Guild ID: %u)", - m_pPlayer->GetName().c_str(), m_pPlayer->GetGUID().GetCounter(), m_pPlayer->GetSession()->GetAccountId(), - pFrom->GetItem()->GetTemplate()->Name1.c_str(), pFrom->GetItem()->GetEntry(), pFrom->GetItem()->GetCount(), - m_pGuild->GetName().c_str(), m_pGuild->GetId()); + "GM {} (Guid: {}) (Account: {}) deposit item: {} (Entry: {} Count: {}) to guild bank named: {} (Guild ID: {})", + m_pPlayer->GetName(), m_pPlayer->GetGUID().GetCounter(), m_pPlayer->GetSession()->GetAccountId(), + pFrom->GetItem()->GetTemplate()->Name1, pFrom->GetItem()->GetEntry(), pFrom->GetItem()->GetCount(), + m_pGuild->GetName(), m_pGuild->GetId()); } } @@ -1718,8 +1718,8 @@ void Guild::HandleMemberDepositMoney(WorldSession* session, uint32 amount) if (player->GetSession()->HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE)) { sLog->OutCommand(player->GetSession()->GetAccountId(), - "GM %s (Account: %u) deposit money (Amount: %u) to guild bank (Guild ID %u)", - player->GetName().c_str(), player->GetSession()->GetAccountId(), amount, m_id); + "GM {} (Account: {}) deposit money (Amount: {}) to guild bank (Guild ID {})", + player->GetName(), player->GetSession()->GetAccountId(), amount, m_id); } } diff --git a/src/server/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp index 8dabaed0ef7..e085d42c579 100644 --- a/src/server/game/Handlers/AuctionHouseHandler.cpp +++ b/src/server/game/Handlers/AuctionHouseHandler.cpp @@ -294,8 +294,8 @@ void WorldSession::HandleAuctionSellItem(WorldPacket& recvData) { if (HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE)) { - sLog->OutCommand(GetAccountId(), "GM %s (Account: %u) create auction: %s (Entry: %u Count: %u)", - GetPlayerName().c_str(), GetAccountId(), item->GetTemplate()->Name1.c_str(), item->GetEntry(), item->GetCount()); + sLog->OutCommand(GetAccountId(), "GM {} (Account: {}) create auction: {} (Entry: {} Count: {})", + GetPlayerName(), GetAccountId(), item->GetTemplate()->Name1, item->GetEntry(), item->GetCount()); } AH->Id = sObjectMgr->GenerateAuctionID(); @@ -352,8 +352,8 @@ void WorldSession::HandleAuctionSellItem(WorldPacket& recvData) if (HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE)) { - sLog->OutCommand(GetAccountId(), "GM %s (Account: %u) create auction: %s (Entry: %u Count: %u)", - GetPlayerName().c_str(), GetAccountId(), newItem->GetTemplate()->Name1.c_str(), newItem->GetEntry(), newItem->GetCount()); + sLog->OutCommand(GetAccountId(), "GM {} (Account: {}) create auction: {} (Entry: {} Count: {})", + GetPlayerName(), GetAccountId(), newItem->GetTemplate()->Name1, newItem->GetEntry(), newItem->GetCount()); } AH->Id = sObjectMgr->GenerateAuctionID(); diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp index 35c588fdbfd..da708a03bc5 100644 --- a/src/server/game/Handlers/MailHandler.cpp +++ b/src/server/game/Handlers/MailHandler.cpp @@ -245,10 +245,10 @@ void WorldSession::HandleSendMail(WorldPackets::Mail::SendMail& sendMail) { if (log) { - sLog->OutCommand(GetAccountId(), "GM %s (GUID: %u) (Account: %u) mail item: %s (Entry: %u Count: %u) " - "to: %s (%s) (Account: %u)", GetPlayerName().c_str(), GetGUIDLow(), GetAccountId(), - item->GetTemplate()->Name1.c_str(), item->GetEntry(), item->GetCount(), - mailInfo.Target.c_str(), receiverGuid.ToString().c_str(), receiverAccountId); + sLog->OutCommand(GetAccountId(), "GM {} (GUID: {}) (Account: {}) mail item: {} (Entry: {} Count: {}) " + "to: {} ({}) (Account: {})", GetPlayerName(), GetGUIDLow(), GetAccountId(), + item->GetTemplate()->Name1, item->GetEntry(), item->GetCount(), + mailInfo.Target, receiverGuid.ToString(), receiverAccountId); } item->SetNotRefundable(GetPlayer()); // makes the item no longer refundable @@ -268,8 +268,8 @@ void WorldSession::HandleSendMail(WorldPackets::Mail::SendMail& sendMail) if (log && mailInfo.SendMoney > 0) { - sLog->OutCommand(GetAccountId(), "GM %s (GUID: %u) (Account: %u) mail money: %u to: %s (%s) (Account: %u)", - GetPlayerName().c_str(), GetGUIDLow(), GetAccountId(), mailInfo.SendMoney, mailInfo.Target.c_str(), receiverGuid.ToString().c_str(), receiverAccountId); + sLog->OutCommand(GetAccountId(), "GM {} (GUID: {}) (Account: {}) mail money: {} to: {} ({}) (Account: {})", + GetPlayerName(), GetGUIDLow(), GetAccountId(), mailInfo.SendMoney, mailInfo.Target, receiverGuid.ToString(), receiverAccountId); } } @@ -468,8 +468,8 @@ void WorldSession::HandleMailTakeItem(WorldPackets::Mail::MailTakeItem& takeItem if (!sCharacterCache->GetCharacterNameByGuid(sender_guid, sender_name)) sender_name = sObjectMgr->GetTrinityStringForDBCLocale(LANG_UNKNOWN); } - sLog->OutCommand(GetAccountId(), "GM %s (Account: %u) receiver mail item: %s (Entry: %u Count: %u) and send COD money: %u to player: %s (Account: %u)", - GetPlayerName().c_str(), GetAccountId(), it->GetTemplate()->Name1.c_str(), it->GetEntry(), it->GetCount(), m->COD, sender_name.c_str(), sender_accId); + sLog->OutCommand(GetAccountId(), "GM {} (Account: {}) receiver mail item: {} (Entry: {} Count: {}) and send COD money: {} to player: {} (Account: {})", + GetPlayerName(), GetAccountId(), it->GetTemplate()->Name1, it->GetEntry(), it->GetCount(), m->COD, sender_name, sender_accId); } else if (!receiver) sender_accId = sCharacterCache->GetCharacterAccountIdByGuid(sender_guid); diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp index b1c3203a10b..048c2930108 100644 --- a/src/server/game/Handlers/TradeHandler.cpp +++ b/src/server/game/Handlers/TradeHandler.cpp @@ -146,10 +146,10 @@ void WorldSession::moveItems(Item* myItems[], Item* hisItems[]) TC_LOG_DEBUG("network", "partner storing: {}", myItems[i]->GetGUID().ToString()); if (HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE)) { - sLog->OutCommand(_player->GetSession()->GetAccountId(), "GM %s (Account: %u) trade: %s (Entry: %d Count: %u) to player: %s (Account: %u)", - _player->GetName().c_str(), _player->GetSession()->GetAccountId(), - myItems[i]->GetTemplate()->Name1.c_str(), myItems[i]->GetEntry(), myItems[i]->GetCount(), - trader->GetName().c_str(), trader->GetSession()->GetAccountId()); + sLog->OutCommand(_player->GetSession()->GetAccountId(), "GM {} (Account: {}) trade: {} (Entry: {} Count: {}) to player: {} (Account: {})", + _player->GetName(), _player->GetSession()->GetAccountId(), + myItems[i]->GetTemplate()->Name1, myItems[i]->GetEntry(), myItems[i]->GetCount(), + trader->GetName(), trader->GetSession()->GetAccountId()); } // adjust time (depends on /played) @@ -164,10 +164,10 @@ void WorldSession::moveItems(Item* myItems[], Item* hisItems[]) TC_LOG_DEBUG("network", "player storing: {}", hisItems[i]->GetGUID().ToString()); if (HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE)) { - sLog->OutCommand(trader->GetSession()->GetAccountId(), "GM %s (Account: %u) trade: %s (Entry: %d Count: %u) to player: %s (Account: %u)", - trader->GetName().c_str(), trader->GetSession()->GetAccountId(), - hisItems[i]->GetTemplate()->Name1.c_str(), hisItems[i]->GetEntry(), hisItems[i]->GetCount(), - _player->GetName().c_str(), _player->GetSession()->GetAccountId()); + sLog->OutCommand(trader->GetSession()->GetAccountId(), "GM {} (Account: {}) trade: {} (Entry: {} Count: {}) to player: {} (Account: {})", + trader->GetName(), trader->GetSession()->GetAccountId(), + hisItems[i]->GetTemplate()->Name1, hisItems[i]->GetEntry(), hisItems[i]->GetCount(), + _player->GetName(), _player->GetSession()->GetAccountId()); } // adjust time (depends on /played) @@ -498,18 +498,18 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/) { if (my_trade->GetMoney() > 0) { - sLog->OutCommand(_player->GetSession()->GetAccountId(), "GM %s (Account: %u) give money (Amount: %u) to player: %s (Account: %u)", - _player->GetName().c_str(), _player->GetSession()->GetAccountId(), + sLog->OutCommand(_player->GetSession()->GetAccountId(), "GM {} (Account: {}) give money (Amount: {}) to player: {} (Account: {})", + _player->GetName(), _player->GetSession()->GetAccountId(), my_trade->GetMoney(), - trader->GetName().c_str(), trader->GetSession()->GetAccountId()); + trader->GetName(), trader->GetSession()->GetAccountId()); } if (his_trade->GetMoney() > 0) { - sLog->OutCommand(trader->GetSession()->GetAccountId(), "GM %s (Account: %u) give money (Amount: %u) to player: %s (Account: %u)", - trader->GetName().c_str(), trader->GetSession()->GetAccountId(), + sLog->OutCommand(trader->GetSession()->GetAccountId(), "GM {} (Account: {}) give money (Amount: {}) to player: {} (Account: {})", + trader->GetName(), trader->GetSession()->GetAccountId(), his_trade->GetMoney(), - _player->GetName().c_str(), _player->GetSession()->GetAccountId()); + _player->GetName(), _player->GetSession()->GetAccountId()); } } diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 387d1947798..c9ab4bbc4b5 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -2572,10 +2572,10 @@ void Spell::EffectEnchantItemPerm() if (item_owner != player && player->GetSession()->HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE)) { - sLog->OutCommand(player->GetSession()->GetAccountId(), "GM %s (Account: %u) enchanting(perm): %s (Entry: %d) for player: %s (Account: %u)", - player->GetName().c_str(), player->GetSession()->GetAccountId(), - itemTarget->GetTemplate()->Name1.c_str(), itemTarget->GetEntry(), - item_owner->GetName().c_str(), item_owner->GetSession()->GetAccountId()); + sLog->OutCommand(player->GetSession()->GetAccountId(), "GM {} (Account: {}) enchanting(perm): {} (Entry: {}) for player: {} (Account: {})", + player->GetName(), player->GetSession()->GetAccountId(), + itemTarget->GetTemplate()->Name1, itemTarget->GetEntry(), + item_owner->GetName(), item_owner->GetSession()->GetAccountId()); } // remove old enchanting before applying new if equipped @@ -2637,10 +2637,10 @@ void Spell::EffectEnchantItemPrismatic() if (item_owner != player && player->GetSession()->HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE)) { - sLog->OutCommand(player->GetSession()->GetAccountId(), "GM %s (Account: %u) enchanting(perm): %s (Entry: %d) for player: %s (Account: %u)", - player->GetName().c_str(), player->GetSession()->GetAccountId(), - itemTarget->GetTemplate()->Name1.c_str(), itemTarget->GetEntry(), - item_owner->GetName().c_str(), item_owner->GetSession()->GetAccountId()); + sLog->OutCommand(player->GetSession()->GetAccountId(), "GM {} (Account: {}) enchanting(perm): {} (Entry: {}) for player: {} (Account: {})", + player->GetName(), player->GetSession()->GetAccountId(), + itemTarget->GetTemplate()->Name1, itemTarget->GetEntry(), + item_owner->GetName(), item_owner->GetSession()->GetAccountId()); } // remove old enchanting before applying new if equipped @@ -2768,10 +2768,10 @@ void Spell::EffectEnchantItemTmp() if (item_owner != player && player->GetSession()->HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE)) { - sLog->OutCommand(player->GetSession()->GetAccountId(), "GM %s (Account: %u) enchanting(temp): %s (Entry: %d) for player: %s (Account: %u)", - player->GetName().c_str(), player->GetSession()->GetAccountId(), - itemTarget->GetTemplate()->Name1.c_str(), itemTarget->GetEntry(), - item_owner->GetName().c_str(), item_owner->GetSession()->GetAccountId()); + sLog->OutCommand(player->GetSession()->GetAccountId(), "GM {} (Account: {}) enchanting(temp): {} (Entry: {}) for player: {} (Account: {})", + player->GetName(), player->GetSession()->GetAccountId(), + itemTarget->GetTemplate()->Name1, itemTarget->GetEntry(), + item_owner->GetName(), item_owner->GetSession()->GetAccountId()); } // remove old enchanting before applying new if equipped diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp index 108df9fa4f0..b8c175f0fa1 100644 --- a/src/server/scripts/Commands/cs_character.cpp +++ b/src/server/scripts/Commands/cs_character.cpp @@ -360,10 +360,10 @@ public: if (WorldSession* session = handler->GetSession()) { if (Player* player = session->GetPlayer()) - sLog->OutCommand(session->GetAccountId(), "GM %s (Account: %u) forced rename %s to player %s (Account: %u)", player->GetName().c_str(), session->GetAccountId(), newName.c_str(), player->GetName().c_str(), sCharacterCache->GetCharacterAccountIdByGuid(player->GetGUID())); + sLog->OutCommand(session->GetAccountId(), "GM {} (Account: {}) forced rename {} to player {} (Account: {})", player->GetName(), session->GetAccountId(), newName, player->GetName(), sCharacterCache->GetCharacterAccountIdByGuid(player->GetGUID())); } else - sLog->OutCommand(0, "CONSOLE forced rename '%s' to '%s' (%s)", player->GetName().c_str(), newName.c_str(), player->GetGUID().ToString().c_str()); + sLog->OutCommand(0, "CONSOLE forced rename '{}' to '{}' ({})", player->GetName(), newName, player->GetGUID().ToString()); } else { @@ -512,10 +512,10 @@ public: if (WorldSession* session = handler->GetSession()) { if (Player* player = session->GetPlayer()) - sLog->OutCommand(session->GetAccountId(), "GM %s (Account: %u) %s", player->GetName().c_str(), session->GetAccountId(), logString.c_str()); + sLog->OutCommand(session->GetAccountId(), "GM {} (Account: {}) {}", player->GetName(), session->GetAccountId(), logString); } else - sLog->OutCommand(0, "%s %s", handler->GetTrinityString(LANG_CONSOLE), logString.c_str()); + sLog->OutCommand(0, "{} {}", handler->GetTrinityString(LANG_CONSOLE), logString); return true; } |
