From 5c83f1aca309037a00e2a7d625642d8da047289b Mon Sep 17 00:00:00 2001 From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Date: Thu, 8 Jun 2023 14:10:23 -0400 Subject: [PATCH] cleanup some descriptions + optimize hoppers patch --- patches/server/Fix-a-bunch-of-vanilla-bugs.patch | 4 ---- patches/server/Optimize-Hoppers.patch | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/patches/server/Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/Fix-a-bunch-of-vanilla-bugs.patch index b5d7e8d366..ddc1f58050 100644 --- a/patches/server/Fix-a-bunch-of-vanilla-bugs.patch +++ b/patches/server/Fix-a-bunch-of-vanilla-bugs.patch @@ -26,15 +26,11 @@ https://bugs.mojang.com/browse/MC-179072 Creepers do not defuse when switching from Survival to Creative/Spectator https://bugs.mojang.com/browse/MC-191591 -https://bugs.mojang.com/browse/MC-258360 Fix items equipped on AbstractHorse losing NBT https://bugs.mojang.com/browse/MC-259571 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 Fix lightning being able to hit spectators diff --git a/patches/server/Optimize-Hoppers.patch b/patches/server/Optimize-Hoppers.patch index 5d51b0b67c..66e145c8cd 100644 --- a/patches/server/Optimize-Hoppers.patch +++ b/patches/server/Optimize-Hoppers.patch @@ -556,7 +556,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 private static boolean canMergeItems(ItemStack first, ItemStack 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