pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-03 21:42:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1112 from noudess/untargettable

Browse Source 
Add check so that the 'u' key does not open a trade window with an untargettable mob.
This commit is contained in:
Chris Miles 2020-08-21 00:24:28 -05:00 committed by GitHub
commit 5d4a78fb3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zone/client_packet.cpp
View File

@ -14246,12 +14246,19 @@ void Client::Handle_OP_TradeRequest(const EQApplicationPacket *app)
// Client requesting a trade session from an npc/client // Client requesting a trade session from an npc/client
// Trade session not started until OP_TradeRequestAck is sent // Trade session not started until OP_TradeRequestAck is sent
CommonBreakInvisible();
// Pass trade request on to recipient
TradeRequest_Struct* msg = (TradeRequest_Struct*)app->pBuffer; TradeRequest_Struct* msg = (TradeRequest_Struct*)app->pBuffer;
Mob* tradee = entity_list.GetMob(msg->to_mob_id); Mob* tradee = entity_list.GetMob(msg->to_mob_id);
// If the tradee is an untargettable mob - ignore
// Helps in cases where servers use invisible_man, body type 11 for quests
// and the client opens a trade by mistake.
if (tradee && (tradee->GetBodyType() == 11)) {
return;
}
CommonBreakInvisible();
// Pass trade request on to recipient
if (tradee && tradee->IsClient()) { if (tradee && tradee->IsClient()) {
tradee->CastToClient()->QueuePacket(app); tradee->CastToClient()->QueuePacket(app);
} }