diff --git a/gradle.properties b/gradle.properties
index 5ecc6ad..4f497c3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=gq.bxteam.divinemc
 
 version=1.19.3-R0.1-SNAPSHOT
 mcVersion=1.19.3
-pufferfishRef=0eb62f17df247fa98a564f1eaba3ffb18896e292
+pufferfishRef=15538a9d3c71687c733c4c6dd94f4b9855917401
 
 org.gradle.jvmargs=-Xmx2G
 
diff --git a/patches/server/0022-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0022-Arrows-should-not-reset-despawn-counter.patch
index df53a5e..eed4fee 100644
--- a/patches/server/0022-Arrows-should-not-reset-despawn-counter.patch
+++ b/patches/server/0022-Arrows-should-not-reset-despawn-counter.patch
@@ -10,10 +10,10 @@ Original code by PurpurMC, licensed under MIT
 You can find the original code on https://github.com/PurpurMC/Purpur
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index e7ef36dac559d03d127cf45373a7e0dc935b80a8..df308678b1211537e1993106af4cab701b470f22 100644
+index 9788e477ff1446ad2ea3669922cc7dfc09900ce8..056ba60a855a2628e0b72ceaa3257da756ee61d9 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-@@ -323,7 +323,7 @@ public abstract class AbstractArrow extends Projectile {
+@@ -312,7 +312,7 @@ public abstract class AbstractArrow extends Projectile {
          Vec3 vec3d = this.getDeltaMovement();
  
          this.setDeltaMovement(vec3d.multiply((double) (this.random.nextFloat() * 0.2F), (double) (this.random.nextFloat() * 0.2F), (double) (this.random.nextFloat() * 0.2F)));
diff --git a/patches/server/0032-vmp-skip-entity-move-if-movement-is-zero.patch b/patches/server/0032-vmp-skip-entity-move-if-movement-is-zero.patch
index 9a4d415..9bdd20f 100644
--- a/patches/server/0032-vmp-skip-entity-move-if-movement-is-zero.patch
+++ b/patches/server/0032-vmp-skip-entity-move-if-movement-is-zero.patch
@@ -9,7 +9,7 @@ Original code by RelativityMC, licensed under MIT
 You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 374b46c344ca868cab7c47be69cb005eb90319e8..f2cf7fefc53b9f203e0722b9f1afeb161aa3d70d 100644
+index 6a9c0f0b4b749c5907a274d6a83254284d8763bb..323c032506c94abdf20104123f511e0ab4163f8d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -299,6 +299,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -20,7 +20,7 @@ index 374b46c344ca868cab7c47be69cb005eb90319e8..f2cf7fefc53b9f203e0722b9f1afeb16
      public boolean onGround;
      public boolean horizontalCollision;
      public boolean verticalCollision;
-@@ -1033,6 +1034,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1034,6 +1035,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      // Paper end - detailed watchdog information
  
      public void move(MoverType movementType, Vec3 movement) {
@@ -33,7 +33,7 @@ index 374b46c344ca868cab7c47be69cb005eb90319e8..f2cf7fefc53b9f203e0722b9f1afeb16
          // Paper start - detailed watchdog information
          io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
          synchronized (this.posLock) {
-@@ -3807,6 +3814,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3817,6 +3824,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public final void setBoundingBox(AABB boundingBox) {
diff --git a/patches/server/0033-lithium-suffocation.patch b/patches/server/0033-lithium-suffocation.patch
index ab38d38..b55ddfc 100644
--- a/patches/server/0033-lithium-suffocation.patch
+++ b/patches/server/0033-lithium-suffocation.patch
@@ -9,10 +9,10 @@ Original license: GNU Lesser General Public License v3.0
 Original project: https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d4d4d49d2a9eb065415f0c5ff5d5a9bc0c2bb25b..6c94efc22a288d664ea8779863aa13b1f3795636 100644
+index 323c032506c94abdf20104123f511e0ab4163f8d..5b657b72132ee7d01dd9b3ac15147bbec3551d3a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2600,39 +2600,64 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2610,39 +2610,64 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return !this.isRemoved();
      }