From 97379814af6ffa2e0e34f19001ac94ed48080f30 Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Tue, 11 Feb 2020 00:33:05 -0400
Subject: [PATCH] fix stackable sboxes

---
 src/main/java/carpet/mixins/ItemEntityMixin.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/carpet/mixins/ItemEntityMixin.java b/src/main/java/carpet/mixins/ItemEntityMixin.java
index 81b62372..dcc185ee 100644
--- a/src/main/java/carpet/mixins/ItemEntityMixin.java
+++ b/src/main/java/carpet/mixins/ItemEntityMixin.java
@@ -82,6 +82,7 @@ public abstract class ItemEntityMixin extends Entity implements ItemEntityInterf
         ItemStack otherStack = other.getStack();
         if (selfStack.getItem() == otherStack.getItem()
                 && !InventoryHelper.shulkerBoxHasItems(selfStack)
+                && !InventoryHelper.shulkerBoxHasItems(otherStack)
                 && selfStack.hasTag() == otherStack.hasTag()
                 && selfStack.getCount() + otherStack.getCount() <= SHULKERBOX_MAX_STACK_AMOUNT)
         {