mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +01:00
20 lines
1.3 KiB
Diff
20 lines
1.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: granny <contact@granny.dev>
|
||
|
|
Date: Sat, 24 Feb 2024 19:33:01 -0800
|
||
|
|
Subject: [PATCH] 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 309acf7bd07e38043aa81e0e686edba1136bd04c..96c898086f35fd83f9b1ce7e3fe53d31b2fa4c31 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
|