From 1b7a1c51aed401d71d22ef4043ca0579e35f5c92 Mon Sep 17 00:00:00 2001 From: Wyrserth Date: Sat, 13 Jul 2019 00:50:26 +0200 Subject: Core/Player: prevent trade system from getting stuck in an invalid state when the LevelReq.Trade config is used. (cherry picked from commit a54af39e29f87735ce2bc9774e664b543c9dff02) --- src/server/game/Handlers/TradeHandler.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp index 94ee9fe9531..294bcca413c 100644 --- a/src/server/game/Handlers/TradeHandler.cpp +++ b/src/server/game/Handlers/TradeHandler.cpp @@ -613,6 +613,8 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPackets::Trade::InitiateTrade& if (GetPlayer()->GetLevel() < sWorld->getIntConfig(CONFIG_TRADE_LEVEL_REQ)) { SendNotification(GetTrinityString(LANG_TRADE_REQ), sWorld->getIntConfig(CONFIG_TRADE_LEVEL_REQ)); + info.Status = TRADE_STATUS_FAILED; + SendTradeStatus(info); return; } @@ -687,6 +689,8 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPackets::Trade::InitiateTrade& if (pOther->GetLevel() < sWorld->getIntConfig(CONFIG_TRADE_LEVEL_REQ)) { SendNotification(GetTrinityString(LANG_TRADE_OTHER_REQ), sWorld->getIntConfig(CONFIG_TRADE_LEVEL_REQ)); + info.Status = TRADE_STATUS_FAILED; + SendTradeStatus(info); return; } -- cgit v1.2.3