From a49d1446b70c7f7fb60d0cea8032d9299602b2b9 Mon Sep 17 00:00:00 2001
From: Mitch Freeman <65987027+neckkola@users.noreply.github.com>
Date: Sun, 24 Nov 2024 19:15:18 -0400
Subject: [PATCH] [Bug Fix] Fix for sending money via Parcel, then changing
 your mind (#4552)

---
 zone/parcels.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/zone/parcels.cpp b/zone/parcels.cpp
index efb926735..e3661906f 100644
--- a/zone/parcels.cpp
+++ b/zone/parcels.cpp
@@ -278,6 +278,19 @@ void Client::DoParcelSend(const Parcel_Struct *parcel_in)
 		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();
 	if (num_of_parcels >= RuleI(Parcel, ParcelMaxItems)) {
 		SendParcelIconStatus();