pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-01 01:52:02 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #933 from fryguy503/no_trade_combat

Browse Source 
Mobs will not trade anymore if they are currently in combat.
This commit is contained in:
Michael Cook (mackal)
2019-11-18 21:59:24 -05:00
committed by GitHub
parent a0de61a781 b567e57971
commit c90326f585
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client_packet.cpp
+10 -10
View File
@@ -14099,16 +14099,16 @@ void Client::Handle_OP_TradeRequest(const EQApplicationPacket *app)
#else #else
else if (tradee && (tradee->IsNPC() || tradee->IsBot())) { else if (tradee && (tradee->IsNPC() || tradee->IsBot())) {
#endif #endif
//npcs always accept if (!tradee->IsEngaged()) {
trade->Start(msg->to_mob_id); trade->Start(msg->to_mob_id);
EQApplicationPacket *outapp = new EQApplicationPacket(OP_TradeRequestAck, sizeof(TradeRequest_Struct));
auto outapp = new EQApplicationPacket(OP_TradeRequestAck, sizeof(TradeRequest_Struct)); TradeRequest_Struct *acc = (TradeRequest_Struct *) outapp->pBuffer;
TradeRequest_Struct* acc = (TradeRequest_Struct*)outapp->pBuffer; acc->from_mob_id = msg->to_mob_id;
acc->from_mob_id = msg->to_mob_id; acc->to_mob_id = msg->from_mob_id;
acc->to_mob_id = msg->from_mob_id; FastQueuePacket(&outapp);
FastQueuePacket(&outapp); safe_delete(outapp);
safe_delete(outapp); }
} }
return; return;
} }