From 0fcaf82038937f958543d3e3913c23c49553104b Mon Sep 17 00:00:00 2001 From: Trust Date: Wed, 13 Nov 2019 23:46:36 +0000 Subject: [PATCH] Per comment, removing message and simplified. --- zone/client_packet.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 24e1d35c9..03b6a9c58 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -14099,17 +14099,8 @@ void Client::Handle_OP_TradeRequest(const EQApplicationPacket *app) #else else if (tradee && (tradee->IsNPC() || tradee->IsBot())) { #endif - // If the NPC is engaged, we cannot trade with it. - // Note that this work as intended, if the NPC is charmed - // you can still trade with it. - if (tradee->IsEngaged()) { - Message(0, "Your target cannot trade with you at this moment."); - } - // If it not engaged, it will automatically accept the trade. - else { - //npcs always accept + if (tradee->!IsEngaged()) { trade->Start(msg->to_mob_id); - EQApplicationPacket *outapp = new EQApplicationPacket(OP_TradeRequestAck, sizeof(TradeRequest_Struct)); TradeRequest_Struct *acc = (TradeRequest_Struct *) outapp->pBuffer; acc->from_mob_id = msg->to_mob_id;