This commit is contained in:
gnembon committed 2021-07-14 00:57:37 -03:00
1 parent fd3c8290cf
commit 4dd3cc7fd6
6 files changed
+10 -10

No files matched your search

@@ -96,7 +96,7 @@ public abstract class ItemEntityMixin extends Entity implements ItemEntityInterf
if (selfStack.getItem() == otherStack.getItem()
&& !InventoryHelper.shulkerBoxHasItems(selfStack)
&& !InventoryHelper.shulkerBoxHasItems(otherStack)
&& selfStack.hasTag() == otherStack.hasTag()
&& selfStack.hasNbt() == otherStack.hasNbt()
&& selfStack.getCount() + otherStack.getCount() <= SHULKERBOX_MAX_STACK_AMOUNT)
{
int amount = Math.min(otherStack.getCount(), SHULKERBOX_MAX_STACK_AMOUNT - selfStack.getCount());
@@ -32,7 +32,7 @@ public abstract class PlayerInventory_scarpetEventMixin
if (count != stack.getCount()) // res returns false for larger item adding to a almost full ineventory
{
ItemStack diffStack = new ItemStack(item, count - stack.getCount());
diffStack.setTag(stack.getTag());
diffStack.setNbt(stack.getNbt());
PLAYER_PICKS_UP_ITEM.onItemAction((ServerPlayerEntity) player, null, diffStack);
}
return res;