pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 18:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Fix for sending money via Parcel, then changing your mind (#4552)

Browse Source
This commit is contained in:
Mitch Freeman 2024-11-24 19:15:18 -04:00 committed by GitHub
parent b2d0fa6a2f
commit a49d1446b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zone/parcels.cpp
View File

@ -278,6 +278,19 @@ void Client::DoParcelSend(const Parcel_Struct *parcel_in)
return; return;
} }
if (parcel_in->money_flag && parcel_in->item_slot != INVALID_INDEX) {
Message(
Chat::Yellow,
fmt::format(
"{} tells you, 'I am confused! Do you want to send money or an item?'",
merchant->GetCleanName()
).c_str()
);
DoParcelCancel();
SendParcelAck();
return;
}
auto num_of_parcels = GetParcelCount(); auto num_of_parcels = GetParcelCount();
if (num_of_parcels >= RuleI(Parcel, ParcelMaxItems)) { if (num_of_parcels >= RuleI(Parcel, ParcelMaxItems)) {
SendParcelIconStatus(); SendParcelIconStatus();