From c901c0d8dd06299d9bdfebe6cda2382d906bba8c Mon Sep 17 00:00:00 2001
From: Kiran Hart <kiran.hart@live.com>
Date: Fri, 7 Jan 2022 11:39:56 -0500
Subject: [PATCH] 2.49.0

---
 .../ca/tweetzy/auctionhouse/guis/GUIBundleCreation.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIBundleCreation.java b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIBundleCreation.java
index f9796c4..a48af33 100644
--- a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIBundleCreation.java
+++ b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIBundleCreation.java
@@ -45,6 +45,8 @@ public final class GUIBundleCreation extends Gui {
 			ItemStack firstItem = null;
 			List<ItemStack> validItems = new ArrayList<>();
 
+			boolean containsBundle = false;
+
 			for (int i = 0; i < 44; i++) {
 				final ItemStack item = getItem(i);
 				if (item == null || item.getType() == XMaterial.AIR.parseMaterial()) continue;
@@ -86,8 +88,8 @@ public final class GUIBundleCreation extends Gui {
 				}
 
 				if (NBTEditor.contains(item, "AuctionBundleItem")) {
-					AuctionHouse.getInstance().getLocale().getMessage("general.cannotsellbundleditem").sendPrefixedMessage(e.player);
 					blocked = true;
+					containsBundle = true;
 				}
 
 				if (blocked) continue;
@@ -104,6 +106,11 @@ public final class GUIBundleCreation extends Gui {
 				return;
 			}
 
+			if (containsBundle) {
+				AuctionHouse.getInstance().getLocale().getMessage("general.cannotsellbundleditem").sendPrefixedMessage(e.player);
+				return;
+			}
+
 			if (validItems.size() == 0) return;
 			final ItemStack bundle = AuctionAPI.getInstance().createBundledItem(firstItem, validItems.toArray(new ItemStack[0]));