diff --git a/patches/server/Fix-MerchantOffer-BuyB-Only-AssertionError.patch b/patches/server/Fix-MerchantOffer-BuyB-Only-AssertionError.patch
new file mode 100644
index 0000000000..7f5661ff43
--- /dev/null
+++ b/patches/server/Fix-MerchantOffer-BuyB-Only-AssertionError.patch
@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: thamid-gamer <60953955+thamid-gamer@users.noreply.github.com>
+Date: Fri, 16 Jul 2021 16:00:17 -0400
+Subject: [PATCH] Fix MerchantOffer BuyB-Only AssertionError
+
+
+diff --git a/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java b/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java
++++ b/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java
+@@ -0,0 +0,0 @@ public class MerchantOffer {
+         if (!this.satisfiedBy(firstBuyStack, secondBuyStack)) {
+             return false;
+         } else {
++            if (!this.getCostA().isEmpty()) // Paper
+             firstBuyStack.shrink(this.getCostA().getCount());
+             if (!this.getCostB().isEmpty()) {
+                 secondBuyStack.shrink(this.getCostB().getCount());