From d80fbedf5d8a8830aa895595114ec1979fc0a3f7 Mon Sep 17 00:00:00 2001 From: granny Date: Mon, 26 Feb 2024 13:48:52 -0800 Subject: [PATCH] port PaperMC/Paper#10285 --- ...heck-if-itemstack-is-stackable-first.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 patches/server/0307-PaperPR-10285-check-if-itemstack-is-stackable-first.patch diff --git a/patches/server/0307-PaperPR-10285-check-if-itemstack-is-stackable-first.patch b/patches/server/0307-PaperPR-10285-check-if-itemstack-is-stackable-first.patch new file mode 100644 index 000000000..619b2a242 --- /dev/null +++ b/patches/server/0307-PaperPR-10285-check-if-itemstack-is-stackable-first.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: granny +Date: Sat, 24 Feb 2024 19:33:01 -0800 +Subject: [PATCH] PaperPR #10285 check if itemstack is stackable first + + +diff --git a/src/main/java/net/minecraft/world/entity/player/Inventory.java b/src/main/java/net/minecraft/world/entity/player/Inventory.java +index deabb3400ee2406a8ec179a96d8cfd86f8edbbd6..c6a925cbd35eb33b27b90bfa8344ac7515d28b76 100644 +--- a/src/main/java/net/minecraft/world/entity/player/Inventory.java ++++ b/src/main/java/net/minecraft/world/entity/player/Inventory.java +@@ -114,7 +114,7 @@ public class Inventory implements Container, Nameable { + } + + private boolean hasRemainingSpaceForItem(ItemStack existingStack, ItemStack stack) { +- return !existingStack.isEmpty() && ItemStack.isSameItemSameTags(existingStack, stack) && existingStack.isStackable() && existingStack.getCount() < existingStack.getMaxStackSize() && existingStack.getCount() < this.getMaxStackSize(); ++ return !existingStack.isEmpty() && existingStack.isStackable() && existingStack.getCount() < existingStack.getMaxStackSize() && existingStack.getCount() < this.getMaxStackSize() && ItemStack.isSameItemSameTags(existingStack, stack); // Paper - check if itemstack is stackable first + } + + // CraftBukkit start - Watch method above! :D