diff --git a/patches/removed/1.20/0889-Set-position-before-player-sending-on-dimension-chan.patch b/patches/removed/1.20/0889-Set-position-before-player-sending-on-dimension-chan.patch
index 4761614a2b..5d6de68da5 100644
--- a/patches/removed/1.20/0889-Set-position-before-player-sending-on-dimension-chan.patch
+++ b/patches/removed/1.20/0889-Set-position-before-player-sending-on-dimension-chan.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Set position before player sending on dimension change
 This causes a moment where the player entity is sent with the previous location, and the
 teleport packet which is sent shortly after is meant to correct that.
 
-This was fixed in 1.19.4 iirc
+Fixed in 1.19.4 (notice how addDuringPortalTeleport is now called AFTER movement is done now)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 index b30972c3ab19795e26589cd0cdd54c43414fe368..c5dc769d13fbc2a88a731d42669d0906ee306e4b 100644
diff --git a/patches/server/0875-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0875-Fix-a-bunch-of-vanilla-bugs.patch
index 7b21cca77f..70db915647 100644
--- a/patches/server/0875-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0875-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/0944-Optimize-Hoppers.patch b/patches/server/0944-Optimize-Hoppers.patch
index 9bc6524a85..0290810efc 100644
--- a/patches/server/0944-Optimize-Hoppers.patch
+++ b/patches/server/0944-Optimize-Hoppers.patch
@@ -68,7 +68,7 @@ index 5bdad1866386908b9fef74d15862eb107fabe68f..370a25d2deb54f10a35ee24d9e7e92fb
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index 6907e647ef4d3f5c9c46edb4cf0905844dd1cea9..93c13cb36024370f6ec71137cebca254af2b3b61 100644
+index 6907e647ef4d3f5c9c46edb4cf0905844dd1cea9..beb70310f2e9657fee89cb4b6a9885712b0116e6 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -193,6 +193,201 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -556,7 +556,7 @@ index 6907e647ef4d3f5c9c46edb4cf0905844dd1cea9..93c13cb36024370f6ec71137cebca254
  
      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