diff --git a/gradle.properties b/gradle.properties
index 2501200..cd033c6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
 version = 1.20.4-R0.1-SNAPSHOT
 mcVersion = 1.20.4
 
-paperCommit = 681bbff110d9a56152ae898c4dfe1c0356b40e69
-purpurCommit = 1083e45074966cc634f23f0a92506fb7d3685874
+paperCommit = 850b736e1442587230bbba241f99eb0cee193cd9
+purpurCommit = d80fbedf5d8a8830aa895595114ec1979fc0a3f7
 
 group = org.plazmamc.plazma
 org.gradle.caching = true
diff --git a/patches/api/0002-Purpur-API-Changes.patch b/patches/api/0002-Purpur-API-Changes.patch
index b806ca4..0305314 100644
--- a/patches/api/0002-Purpur-API-Changes.patch
+++ b/patches/api/0002-Purpur-API-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: granny <contact@granny.dev>
-Date: Sun, 25 Feb 2024 11:53:25 +0900
+Date: Sun, 3 Mar 2024 00:58:34 +0000
 Subject: [PATCH] Purpur API Changes
 
 PurpurMC
diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch
index d9e6f4f..94acd1a 100644
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kevin Raneri <kevin.raneri@gmail.com>
-Date: Sun, 25 Feb 2024 11:53:24 +0900
+Date: Sun, 3 Mar 2024 00:58:33 +0000
 Subject: [PATCH] Pufferfish Server Changes
 
 Pufferfish
diff --git a/patches/server/0002-Purpur-Server-Changes.patch b/patches/server/0002-Purpur-Server-Changes.patch
index ebdee41..6bbd742 100644
--- a/patches/server/0002-Purpur-Server-Changes.patch
+++ b/patches/server/0002-Purpur-Server-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: granny <contact@granny.dev>
-Date: Sun, 25 Feb 2024 11:53:25 +0900
+Date: Sun, 3 Mar 2024 00:58:34 +0000
 Subject: [PATCH] Purpur Server Changes
 
 PurpurMC
@@ -15503,6 +15503,19 @@ index d7bddedb19c10f62fd1f7d3128453ad706ed16be..752b38d45d59d8b3cd492246e5aa4f37
  
              if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) {
                  blockposition1 = blockposition2;
+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 deabb3400ee2406a8ec179a96d8cfd86f8edbbd6..c6a925cbd35eb33b27b90bfa8344ac7515d28b76 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
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
 index 567704f61034363e48ef2a5b5566ebdc91682297..43199815ffe3d666577390b96187aa898ceb910e 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java