twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 04:32:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup some descriptions + optimize hoppers patch

Browse Source
This commit is contained in:
Owen1212055
2023-06-08 14:10:23 -04:00
parent 27c0ed55ea
commit 5c83f1aca3
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/Fix-a-bunch-of-vanilla-bugs.patch
View File

@@ -26,15 +26,11 @@ https://bugs.mojang.com/browse/MC-179072
Creepers do not defuse when switching from Survival to Creative/Spectator Creepers do not defuse when switching from Survival to Creative/Spectator
https://bugs.mojang.com/browse/MC-191591 https://bugs.mojang.com/browse/MC-191591
https://bugs.mojang.com/browse/MC-258360
Fix items equipped on AbstractHorse losing NBT Fix items equipped on AbstractHorse losing NBT
https://bugs.mojang.com/browse/MC-259571 https://bugs.mojang.com/browse/MC-259571
Fix changeGameModeForPlayer to use gameModeForPlayer Fix changeGameModeForPlayer to use gameModeForPlayer
https://bugs.mojang.com/browse/MC-260219
Play sniffer eat sound for the last item
https://bugs.mojang.com/browse/MC-262422 https://bugs.mojang.com/browse/MC-262422
Fix lightning being able to hit spectators Fix lightning being able to hit spectators

2
patches/server/Optimize-Hoppers.patch
View File

@@ -556,7 +556,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
private static boolean canMergeItems(ItemStack first, ItemStack second) { private static boolean canMergeItems(ItemStack first, ItemStack second) {
- return first.getCount() <= first.getMaxStackSize() && ItemStack.isSameItemSameTags(first, second); - return first.getCount() <= first.getMaxStackSize() && ItemStack.isSameItemSameTags(first, second);
+ return first.is(second.getItem()) && first.getDamageValue() == second.getDamageValue() && first.getCount() < first.getMaxStackSize() && ItemStack.isSameItemSameTags(first, second); // Paper - used to return true for full itemstacks?! + return first.getCount() < first.getMaxStackSize() && first.is(second.getItem()) && first.getDamageValue() == second.getDamageValue() && ((first.isEmpty() && second.isEmpty()) || java.util.Objects.equals(first.getTag(), second.getTag())); // Paper - used to return true for full itemstacks?!
} }
@Override @Override