Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/PacketIO: Implemented CMSG_BUSY_TRADE and CMSG_IGNORE_TRADE (#29570)

Browse Source 
Closes #29308

(cherry picked from commit 420cbd7396)

# Conflicts:
#	src/server/game/Handlers/TradeHandler.cpp
This commit is contained in:
Mykhailo Redko
2024-01-24 22:09:01 +02:00
committed by Ovahlord
parent 9a77ca34b3
commit d0e34a9bed
4 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/game/Entities/Player/Player.cpp
View File

@@ -12851,17 +12851,16 @@ bool Player::IsUsingTwoHandedWeaponInOneHand() const
return true;
}
void Player::TradeCancel(bool sendback)
void Player::TradeCancel(bool sendback, TradeStatus status /*= TRADE_STATUS_TRADE_CANCELED*/)
{
if (m_trade)
{
Player* trader = m_trade->GetTrader();
// send yellow "Trade canceled" message to both traders
if (sendback)
GetSession()->SendCancelTrade();
GetSession()->SendCancelTrade(status);
trader->GetSession()->SendCancelTrade();
trader->GetSession()->SendCancelTrade(status);
// cleanup
delete m_trade;

2
src/server/game/Entities/Player/Player.h
View File

@@ -1447,7 +1447,7 @@ class TC_GAME_API Player final : public Unit, public GridObject<Player>
Player* GetTrader() const;
TradeData* GetTradeData() const { return m_trade; }
void TradeCancel(bool sendback);
void TradeCancel(bool sendback, TradeStatus status = TRADE_STATUS_TRADE_CANCELED);
CinematicMgr* GetCinematicMgr() const { return _cinematicMgr.get(); }

13
src/server/game/Handlers/TradeHandler.cpp
View File

@@ -42,10 +42,12 @@ void WorldSession::SendTradeStatus(WorldPackets::Trade::TradeStatus& info)
void WorldSession::HandleIgnoreTradeOpcode(WorldPackets::Trade::IgnoreTrade& /*ignoreTrade*/)
{
_player->TradeCancel(true, TRADE_STATUS_IGNORE_YOU);
}
void WorldSession::HandleBusyTradeOpcode(WorldPackets::Trade::BusyTrade& /*busyTrade*/)
{
_player->TradeCancel(true, TRADE_STATUS_BUSY);
}
void WorldSession::SendUpdateTrade(bool trader_data /*= true*/)
@@ -559,13 +561,13 @@ void WorldSession::HandleBeginTradeOpcode(WorldPackets::Trade::BeginTrade& /*beg
SendTradeStatus(info);
}
void WorldSession::SendCancelTrade()
void WorldSession::SendCancelTrade(TradeStatus status)
{
if (PlayerRecentlyLoggedOut() || PlayerLogout())
return;
WorldPackets::Trade::TradeStatus info;
info.Status = TRADE_STATUS_CANCELLED;
info.Status = status;
SendTradeStatus(info);
}
@@ -661,13 +663,6 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPackets::Trade::InitiateTrade&
return;
}
if (pOther->GetSocial()->HasIgnore(GetPlayer()->GetGUID(), GetPlayer()->GetSession()->GetAccountGUID()))
{
info.Status = TRADE_STATUS_PLAYER_IGNORED;
SendTradeStatus(info);
return;
}
if ((pOther->GetTeam() != _player->GetTeam() ||
pOther->HasPlayerFlagEx(PLAYER_FLAGS_EX_MERCENARY_MODE) ||
_player->HasPlayerFlagEx(PLAYER_FLAGS_EX_MERCENARY_MODE)) &&

2
src/server/game/Server/WorldSession.h
View File

@@ -1046,7 +1046,7 @@ class TC_GAME_API WorldSession
void SendTradeStatus(WorldPackets::Trade::TradeStatus& status);
void SendUpdateTrade(bool trader_data = true);
void SendCancelTrade();
void SendCancelTrade(TradeStatus status);
void SendPetitionQueryOpcode(ObjectGuid petitionguid);