Core/PacketIO: Fixed and enabled SMSG_ITEM_REFUND_RESULT
This commit is contained in:
1 parent
c9fc56364b
commit
46cf08684d
4 files changed
+56
-25
No files matched your search
@@ -19797,7 +19797,7 @@ void Player::SendResetInstanceFailed(uint32 reason, uint32 MapId)
|
||||
// 1: There are players offline in your party.
|
||||
// 2>: There are players in your party attempting to zone into an instance.
|
||||
*/
|
||||
WorldPacket data(SMSG_INSTANCE_RESET_FAILED, 4);
|
||||
WorldPacket data(SMSG_INSTANCE_RESET_FAILED, 8);
|
||||
data << uint32(reason);
|
||||
data << uint32(MapId);
|
||||
GetSession()->SendPacket(&data);
|
||||
@@ -25354,7 +25354,7 @@ void Player::DeleteRefundReference(uint32 it)
|
||||
}
|
||||
}
|
||||
|
||||
void Player::SendRefundInfo(Item *item)
|
||||
void Player::SendRefundInfo(Item* item)
|
||||
{
|
||||
// This function call unsets ITEM_FLAGS_REFUNDABLE if played time is over 2 hours.
|
||||
item->UpdatePlayedTime(this);
|
||||
@@ -25439,6 +25439,51 @@ bool Player::AddItem(uint32 itemId, uint32 count)
|
||||
return true;
|
||||
}
|
||||
|
||||
void Player::SendItemRefundResult(Item* item, ItemExtendedCostEntry const* iece, uint8 error)
|
||||
{
|
||||
ObjectGuid guid = item->GetGUID();
|
||||
WorldPacket data(SMSG_ITEM_REFUND_RESULT, 1 + 1 + 8 + 4*8 + 4 + 4*8 + 1);
|
||||
data.WriteBit(guid[4]);
|
||||
data.WriteBit(guid[5]);
|
||||
data.WriteBit(guid[1]);
|
||||
data.WriteBit(guid[6]);
|
||||
data.WriteBit(guid[7]);
|
||||
data.WriteBit(guid[0]);
|
||||
data.WriteBit(guid[3]);
|
||||
data.WriteBit(guid[2]);
|
||||
data.WriteBit(!error);
|
||||
data.WriteBit(item->GetPaidMoney() > 0);
|
||||
data.FlushBits();
|
||||
if (!error)
|
||||
{
|
||||
for (uint8 i = 0; i < MAX_ITEM_EXT_COST_CURRENCIES; ++i)
|
||||
{
|
||||
data << uint32(iece->RequiredCurrencyCount[i]);
|
||||
data << uint32(iece->RequiredCurrency[i]);
|
||||
}
|
||||
|
||||
data << uint32(item->GetPaidMoney()); // money cost
|
||||
|
||||
for (uint8 i = 0; i < MAX_ITEM_EXT_COST_ITEMS; ++i) // item cost data
|
||||
{
|
||||
data << uint32(iece->RequiredItemCount[i]);
|
||||
data << uint32(iece->RequiredItem[i]);
|
||||
}
|
||||
}
|
||||
|
||||
data.WriteByteSeq(guid[0]);
|
||||
data.WriteByteSeq(guid[3]);
|
||||
data.WriteByteSeq(guid[1]);
|
||||
data.WriteByteSeq(guid[6]);
|
||||
data.WriteByteSeq(guid[4]);
|
||||
data.WriteByteSeq(guid[2]);
|
||||
data.WriteByteSeq(guid[7]);
|
||||
data.WriteByteSeq(guid[5]);
|
||||
|
||||
data << uint8(error); // error code
|
||||
GetSession()->SendPacket(&data);
|
||||
}
|
||||
|
||||
void Player::RefundItem(Item* item)
|
||||
{
|
||||
if (!item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_REFUNDABLE))
|
||||
@@ -25450,10 +25495,7 @@ void Player::RefundItem(Item* item)
|
||||
if (item->IsRefundExpired()) // item refund has expired
|
||||
{
|
||||
item->SetNotRefundable(this);
|
||||
WorldPacket data(SMSG_ITEM_REFUND_RESULT, 8+4);
|
||||
data << uint64(item->GetGUID()); // Guid
|
||||
data << uint32(10); // Error!
|
||||
GetSession()->SendPacket(&data);
|
||||
SendItemRefundResult(item, NULL, 10);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -25491,23 +25533,11 @@ void Player::RefundItem(Item* item)
|
||||
|
||||
if (store_error)
|
||||
{
|
||||
WorldPacket data(SMSG_ITEM_REFUND_RESULT, 8+4);
|
||||
data << uint64(item->GetGUID()); // Guid
|
||||
data << uint32(10); // Error!
|
||||
GetSession()->SendPacket(&data);
|
||||
SendItemRefundResult(item, iece, 10);
|
||||
return;
|
||||
}
|
||||
|
||||
WorldPacket data(SMSG_ITEM_REFUND_RESULT, 8+4+4+4+4+4*4+4*4);
|
||||
data << uint64(item->GetGUID()); // item guid
|
||||
data << uint32(0); // 0, or error code
|
||||
data << uint32(item->GetPaidMoney()); // money cost
|
||||
for (uint8 i = 0; i < MAX_ITEM_EXT_COST_CURRENCIES; ++i) // item cost data
|
||||
{
|
||||
data << uint32(iece->RequiredItem[i]);
|
||||
data << uint32(iece->RequiredItemCount[i]);
|
||||
}
|
||||
GetSession()->SendPacket(&data);
|
||||
SendItemRefundResult(item, iece, 0);
|
||||
|
||||
uint32 moneyRefund = item->GetPaidMoney(); // item-> will be invalidated in DestroyItem
|
||||
|
||||
|
||||
@@ -2873,6 +2873,7 @@ class Player : public Unit, public GridObject<Player>
|
||||
std::set<uint32> m_refundableItems;
|
||||
void SendRefundInfo(Item* item);
|
||||
void RefundItem(Item* item);
|
||||
void SendItemRefundResult(Item* item, ItemExtendedCostEntry const* iece, uint8 error);
|
||||
|
||||
// know currencies are not removed at any point (0 displayed)
|
||||
void AddKnownCurrency(uint32 itemId);
|
||||
|
||||
@@ -1015,7 +1015,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacke
|
||||
}
|
||||
|
||||
/*this procedure handles clients CMSG_REQUEST_PARTY_MEMBER_STATS request*/
|
||||
void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket &recvData)
|
||||
void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recvData)
|
||||
{
|
||||
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_REQUEST_PARTY_MEMBER_STATS");
|
||||
uint64 Guid;
|
||||
|
||||
@@ -1002,9 +1002,9 @@ void InitOpcodes()
|
||||
//DEFINE_OPCODE_HANDLER(SMSG_INSPECT_TALENT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
//DEFINE_OPCODE_HANDLER(SMSG_INSTANCE_DIFFICULTY, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
//DEFINE_OPCODE_HANDLER(SMSG_INSTANCE_LOCK_WARNING_QUERY, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
//DEFINE_OPCODE_HANDLER(SMSG_INSTANCE_RESET, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
//DEFINE_OPCODE_HANDLER(SMSG_INSTANCE_RESET_FAILED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
//DEFINE_OPCODE_HANDLER(SMSG_INSTANCE_SAVE_CREATED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
DEFINE_OPCODE_HANDLER(SMSG_INSTANCE_RESET, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
DEFINE_OPCODE_HANDLER(SMSG_INSTANCE_RESET_FAILED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
DEFINE_OPCODE_HANDLER(SMSG_INSTANCE_SAVE_CREATED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
//DEFINE_OPCODE_HANDLER(SMSG_INVALIDATE_DANCE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
//DEFINE_OPCODE_HANDLER(SMSG_INVALIDATE_PLAYER, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
//DEFINE_OPCODE_HANDLER(SMSG_INVALID_PROMOTION_CODE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
@@ -1015,7 +1015,7 @@ void InitOpcodes()
|
||||
//DEFINE_OPCODE_HANDLER(SMSG_ITEM_EXPIRE_PURCHASE_REFUND, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
DEFINE_OPCODE_HANDLER(SMSG_ITEM_PUSH_RESULT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
DEFINE_OPCODE_HANDLER(SMSG_ITEM_REFUND_INFO_RESPONSE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
//DEFINE_OPCODE_HANDLER(SMSG_ITEM_REFUND_RESULT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
DEFINE_OPCODE_HANDLER(SMSG_ITEM_REFUND_RESULT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
//DEFINE_OPCODE_HANDLER(SMSG_ITEM_REMOVE_PASSIVE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
//DEFINE_OPCODE_HANDLER(SMSG_ITEM_SEND_PASSIVE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
DEFINE_OPCODE_HANDLER(SMSG_ITEM_TEXT_QUERY_RESPONSE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
|
||||
Reference in new issue
Block a user