From d408bd28411ab21150f488d32d51cdcced114319 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 14 Feb 2023 07:22:31 -0500 Subject: [PATCH] Some misc fixes. Thanks Pandaros. --- .../Database/Databases/CharacterDatabase.cs | 2 +- Source/Game/Entities/Player/Player.DB.cs | 2 +- Source/Game/Handlers/MailHandler.cs | 2 +- Source/Game/Networking/Packets/MailPackets.cs | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Source/Framework/Database/Databases/CharacterDatabase.cs b/Source/Framework/Database/Databases/CharacterDatabase.cs index 78fe23bf9..a4e1627ca 100644 --- a/Source/Framework/Database/Databases/CharacterDatabase.cs +++ b/Source/Framework/Database/Databases/CharacterDatabase.cs @@ -611,7 +611,7 @@ namespace Framework.Database PrepareStatement(CharStatements.UPD_CHAR_QUESTSTATUS_REWARDED_ACTIVE_BY_QUEST, "UPDATE character_queststatus_rewarded SET active = 0 WHERE quest = ? AND guid = ?"); PrepareStatement(CharStatements.DEL_INVALID_QUEST_PROGRESS_CRITERIA, "DELETE FROM character_queststatus_objectives_criteria WHERE questObjectiveId = ?"); PrepareStatement(CharStatements.DEL_CHAR_SKILL_BY_SKILL, "DELETE FROM character_skills WHERE guid = ? AND skill = ?"); - PrepareStatement(CharStatements.INS_CHAR_SKILLS, "INSERT INTO character_skills (guid, skill, value, max, professionSlot) VALUES (?, ?, ?, ?)"); + PrepareStatement(CharStatements.INS_CHAR_SKILLS, "INSERT INTO character_skills (guid, skill, value, max, professionSlot) VALUES (?, ?, ?, ?, ?)"); PrepareStatement(CharStatements.UPD_CHAR_SKILLS, "UPDATE character_skills SET value = ?, max = ?, professionSlot = ? WHERE guid = ? AND skill = ?"); PrepareStatement(CharStatements.INS_CHAR_SPELL, "INSERT INTO character_spell (guid, spell, active, disabled) VALUES (?, ?, ?, ?)"); PrepareStatement(CharStatements.DEL_CHAR_SPELL_FAVORITE, "DELETE FROM character_spell_favorite WHERE guid = ? AND spell = ?"); diff --git a/Source/Game/Entities/Player/Player.DB.cs b/Source/Game/Entities/Player/Player.DB.cs index 3cac76658..f265a7dff 100644 --- a/Source/Game/Entities/Player/Player.DB.cs +++ b/Source/Game/Entities/Player/Player.DB.cs @@ -4136,7 +4136,7 @@ namespace Game.Entities do { - ulong mailId = resultItems.Read(44); + ulong mailId = resultItems.Read(52); Item mailItem = _LoadMailedItem(playerGuid, null, mailId, null, resultItems.GetFields(), additionalData.LookupByKey(resultItems.Read(0))); if (mailItem != null) itemsByMail.Add(mailId, mailItem); diff --git a/Source/Game/Handlers/MailHandler.cs b/Source/Game/Handlers/MailHandler.cs index d0775d329..8e8558c7d 100644 --- a/Source/Game/Handlers/MailHandler.cs +++ b/Source/Game/Handlers/MailHandler.cs @@ -262,7 +262,7 @@ namespace Game } if (log && sendMail.Info.SendMoney > 0) - Log.outCommand(GetAccountId(), "GM {GetPlayerName()} ({_player.GetGUID()}) (Account: {GetAccountId()}) mail money: {mailInfo.SendMoney} to: {mailInfo.Target} ({receiverGuid}) (Account: {receiverAccountId})"); + Log.outCommand(GetAccountId(), $"GM {GetPlayerName()} ({_player.GetGUID()}) (Account: {GetAccountId()}) mail money: {sendMail.Info.SendMoney} to: {sendMail.Info.Target} ({receiverGuid}) (Account: {receiverAccountId})"); } // If theres is an item, there is a one hour delivery delay if sent to another account's character. diff --git a/Source/Game/Networking/Packets/MailPackets.cs b/Source/Game/Networking/Packets/MailPackets.cs index 61501c337..23aa4104c 100644 --- a/Source/Game/Networking/Packets/MailPackets.cs +++ b/Source/Game/Networking/Packets/MailPackets.cs @@ -45,7 +45,7 @@ namespace Game.Networking.Packets public override void Read() { Mailbox = _worldPacket.ReadPackedGuid(); - MailID = _worldPacket.ReadUInt32(); + MailID = _worldPacket.ReadUInt64(); } public ObjectGuid Mailbox; @@ -137,7 +137,7 @@ namespace Game.Networking.Packets public override void Read() { - MailID = _worldPacket.ReadUInt32(); + MailID = _worldPacket.ReadUInt64(); SenderGUID = _worldPacket.ReadPackedGuid(); } @@ -152,7 +152,7 @@ namespace Game.Networking.Packets public override void Read() { Mailbox = _worldPacket.ReadPackedGuid(); - MailID = _worldPacket.ReadUInt32(); + MailID = _worldPacket.ReadUInt64(); } public ObjectGuid Mailbox; @@ -165,7 +165,7 @@ namespace Game.Networking.Packets public override void Read() { - MailID = _worldPacket.ReadUInt32(); + MailID = _worldPacket.ReadUInt64(); DeleteReason = _worldPacket.ReadInt32(); } @@ -180,8 +180,8 @@ namespace Game.Networking.Packets public override void Read() { Mailbox = _worldPacket.ReadPackedGuid(); - MailID = _worldPacket.ReadUInt32(); - AttachID = _worldPacket.ReadUInt32(); + MailID = _worldPacket.ReadUInt64(); + AttachID = _worldPacket.ReadUInt64(); } public ObjectGuid Mailbox; @@ -196,7 +196,7 @@ namespace Game.Networking.Packets public override void Read() { Mailbox = _worldPacket.ReadPackedGuid(); - MailID = _worldPacket.ReadUInt32(); + MailID = _worldPacket.ReadUInt64(); Money = _worldPacket.ReadUInt64(); }