mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

[ci skip] Add more patch identifying comments

Browse source
This commit is contained in:
Nassim Jahnke 2024-01-13 18:34:33 +01:00
commit 393db207da
20 changed files with 137 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

4
patches/server/Allow-proper-checking-of-empty-item-stacks.patch
View file

@ -17,7 +17,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ public boolean isEmpty() {
+ return handle == null || handle.isEmpty();
+ }
+ // Paper end
+ // Paper end - override isEmpty to use vanilla's impl
+
public static net.minecraft.world.item.ItemStack asNMSCopy(ItemStack original) {
if (original instanceof CraftItemStack) {
@ -25,7 +25,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
return stack.handle == null ? net.minecraft.world.item.ItemStack.EMPTY : stack.handle.copy();
}
- if (original == null || original.getType() == Material.AIR) {
+ if (original == null || original.isEmpty()) { // Paper - use isEmpty
+ if (original == null || original.isEmpty()) { // Paper - override isEmpty to use vanilla's impl; use isEmpty
return net.minecraft.world.item.ItemStack.EMPTY;
}