diff --git a/build.gradle.kts b/build.gradle.kts
index 53a3d6313..587f83ed8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ import io.papermc.paperweight.util.constants.PAPERCLIP_CONFIG
 plugins {
     java
     id("com.github.johnrengelman.shadow") version "7.1.2" apply false
-    id("io.papermc.paperweight.patcher") version "1.3.8"
+    id("io.papermc.paperweight.patcher") version "1.3.9"
 }
 
 repositories {
@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.8.2:fat")
+    remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
     decompiler("net.minecraftforge:forgeflower:1.5.605.7")
     paperclip("io.papermc:paperclip:3.0.2")
 }
diff --git a/gradle.properties b/gradle.properties
index 1c9df17b5..80f0ae7a2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,4 +5,4 @@ org.gradle.vfs.watch=false
 group=gg.pufferfish.pufferfish
 version=1.19.2-R0.1-SNAPSHOT
 mcVersion=1.19.2
-paperRef=13cf5461d4d6e2397be7f8585b2779005b0774b2
+paperRef=215111213b878f2d837032632c83fabe09000bc2
diff --git a/patches/server/0001-Pufferfish-branding.patch b/patches/server/0001-Pufferfish-branding.patch
index 26bc144b9..4c0461691 100644
--- a/patches/server/0001-Pufferfish-branding.patch
+++ b/patches/server/0001-Pufferfish-branding.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Pufferfish branding
 Update branding
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 44e0f265432487fe5c3c00c5245041298ade16a0..767ab9b7c6cb934db02ebd8b20130bde9aebb848 100644
+index b0e4f11e8af4b909a56bb5576d05ef0537fb25f7..5344140dd36ee7b2ca82461b082c8e3223f8b836 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -9,8 +9,12 @@ plugins {
+@@ -7,8 +7,12 @@ plugins {
  }
  
  dependencies {
@@ -24,7 +24,7 @@ index 44e0f265432487fe5c3c00c5245041298ade16a0..767ab9b7c6cb934db02ebd8b20130bde
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -64,7 +68,7 @@ tasks.jar {
+@@ -62,7 +66,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -199,7 +199,7 @@ index 0000000000000000000000000000000000000000..e877921370f6009a4bd204d9b17d2d58
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ce81ba5345c8d2fde8a2534b9673275c7e86af8b..497e0dc337154ff4d0a7d057768ff5b5b6fda943 100644
+index 6dc6c3bccb4ba34268a87b0754c87eb1e0df4135..6ba71433f50e7fdfed5e9da273d7163f992b69cf 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1654,7 +1654,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -212,7 +212,7 @@ index ce81ba5345c8d2fde8a2534b9673275c7e86af8b..497e0dc337154ff4d0a7d057768ff5b5
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 111f8276f26350a5c62a7b8577b4598978b5355d..d0e1eda747c463a4b99754a4617acd39806fdec0 100644
+index 4212568bf8de6988c71f43d3e2152fa0fe51d0d7..6ec5572d4bd6d4279d22ecbd64583e9b4dbb2aad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper
diff --git a/patches/server/0003-Pufferfish-Config-and-Command.patch b/patches/server/0003-Pufferfish-Config-and-Command.patch
index 70202f2bc..d58ca64ef 100644
--- a/patches/server/0003-Pufferfish-Config-and-Command.patch
+++ b/patches/server/0003-Pufferfish-Config-and-Command.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Pufferfish Config and Command
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 767ab9b7c6cb934db02ebd8b20130bde9aebb848..f6ce5a851246673f17b522da33d65f04f50a0786 100644
+index 5344140dd36ee7b2ca82461b082c8e3223f8b836..408430ebbba5a2cec5269817e66bce9c49c39948 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -48,6 +48,13 @@ dependencies {
+@@ -46,6 +46,13 @@ dependencies {
      runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
      runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
  
@@ -252,7 +252,7 @@ index 0000000000000000000000000000000000000000..deb52c185705c4b4186c7bae02f2a827
 +	
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 2932d2bb797a49e904cebec4285d24d69b429cd9..6ad8200d6ddfdd9f9e3e0b7e7647bf9661f4bfae 100644
+index ff3eced0e20c39b825586897ee2fed01dd471d88..99bbb5b2e5462114cd0802961461abd961301958 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -226,6 +226,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0004-Add-SIMD-utilities.patch b/patches/server/0004-Add-SIMD-utilities.patch
index 121c178cd..c927ebf54 100644
--- a/patches/server/0004-Add-SIMD-utilities.patch
+++ b/patches/server/0004-Add-SIMD-utilities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add SIMD utilities
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 112046e4dfd6e777eaee8533fff3971d683312f7..894af7c17997aacdfefe2da39550b132bedaa917 100644
+index 408430ebbba5a2cec5269817e66bce9c49c39948..9d4fc7b32e4b3f232748b7f6808c33f989649f5c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -63,6 +63,14 @@ dependencies {
+@@ -61,6 +61,14 @@ dependencies {
  }
  
  val craftbukkitPackageVersion = "1_19_R1" // Paper
diff --git a/patches/server/0020-Flare-Profiler.patch b/patches/server/0020-Flare-Profiler.patch
index 846909694..2ea8e84e9 100644
--- a/patches/server/0020-Flare-Profiler.patch
+++ b/patches/server/0020-Flare-Profiler.patch
@@ -20,10 +20,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9746ce97d05cace4104e6992126fb983beadc4cf..7b74ec475b1e953080d5aa8b0a10d1680e7c46f1 100644
+index 9d4fc7b32e4b3f232748b7f6808c33f989649f5c..5b43f5c27ce903c53cbce245477fbdefdc88733f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -54,6 +54,7 @@ dependencies {
+@@ -52,6 +52,7 @@ dependencies {
          exclude(group="org.yaml", module="snakeyaml")
      }
      // Pufferfish end
diff --git a/patches/server/0028-Make-EntityCollisionContext-a-live-representation.patch b/patches/server/0028-Make-EntityCollisionContext-a-live-representation.patch
index 6a2431166..e250f03d0 100644
--- a/patches/server/0028-Make-EntityCollisionContext-a-live-representation.patch
+++ b/patches/server/0028-Make-EntityCollisionContext-a-live-representation.patch
@@ -11,7 +11,7 @@ saved for later, so this should be safe assuming plugins don't use it
 for some strange reason.
 
 diff --git a/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java b/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java
-index b1992ed5136cc7dcf04219868b94b3c37ae36b4b..5b5339cba819368f4d6b7eaf404fa59bca4c0518 100644
+index ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7496a5f25 100644
 --- a/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java
 +++ b/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java
 @@ -19,47 +19,66 @@ public class EntityCollisionContext implements CollisionContext {
@@ -72,12 +72,12 @@ index b1992ed5136cc7dcf04219868b94b3c37ae36b4b..5b5339cba819368f4d6b7eaf404fa59b
      }
  
      @Override
-     public boolean canStandOnFluid(FluidState state, FluidState fluidState) {
--        return this.canStandOnFluid.test(fluidState) && !state.getType().isSame(fluidState.getType());
+     public boolean canStandOnFluid(FluidState stateAbove, FluidState state) {
+-        return this.canStandOnFluid.test(state) && !stateAbove.getType().isSame(state.getType());
 +        // Pufferfish start
 +        Entity entity = this.entity;
 +        if (entity instanceof LivingEntity livingEntity) {
-+            return livingEntity.canStandOnFluid(fluidState) && !state.getType().isSame(fluidState.getType());
++            return livingEntity.canStandOnFluid(state) && !stateAbove.getType().isSame(state.getType());
 +        }
 +        return false;
 +        // Pufferfish end
diff --git a/patches/server/0030-Better-checking-for-useless-move-packets.patch b/patches/server/0030-Better-checking-for-useless-move-packets.patch
index d706781bf..48d3c9cd0 100644
--- a/patches/server/0030-Better-checking-for-useless-move-packets.patch
+++ b/patches/server/0030-Better-checking-for-useless-move-packets.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Better checking for useless move packets
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 3b144c820531122eb37d41be06c182b5f5dc0724..1eb912ad97f9663bf6bd336ad739f2552b0a5c9b 100644
+index 2358bb1788cfb902bac9b3b7588954af2d2cd823..163f14b4e1ca99d75e5d8e14190f7b91cb58e8f3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -165,6 +165,7 @@ public class ServerEntity {
+@@ -166,6 +166,7 @@ public class ServerEntity {
                      boolean flag4 = k < -32768L || k > 32767L || l < -32768L || l > 32767L || i1 < -32768L || i1 > 32767L;
  
                      if (!flag4 && this.teleportDelay <= 400 && !this.wasRiding && this.wasOnGround == this.entity.isOnGround() && !(io.papermc.paper.configuration.GlobalConfiguration.get().collisions.sendFullPosForHardCollidingEntities && this.entity.hardCollides())) { // Paper - send full pos for hard colliding entities to prevent collision problems due to desync
@@ -16,7 +16,7 @@ index 3b144c820531122eb37d41be06c182b5f5dc0724..1eb912ad97f9663bf6bd336ad739f255
                          if ((!flag2 || !flag3) && !(this.entity instanceof AbstractArrow)) {
                              if (flag2) {
                                  packet1 = new ClientboundMoveEntityPacket.Pos(this.entity.getId(), (short) ((int) k), (short) ((int) l), (short) ((int) i1), this.entity.isOnGround());
-@@ -174,6 +175,7 @@ public class ServerEntity {
+@@ -175,6 +176,7 @@ public class ServerEntity {
                          } else {
                              packet1 = new ClientboundMoveEntityPacket.PosRot(this.entity.getId(), (short) ((int) k), (short) ((int) l), (short) ((int) i1), (byte) i, (byte) j, this.entity.isOnGround());
                          }
diff --git a/patches/server/0041-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0041-Reduce-entity-fluid-lookups-if-no-fluids.patch
index 815f835ae..59e59d0fa 100644
--- a/patches/server/0041-Reduce-entity-fluid-lookups-if-no-fluids.patch
+++ b/patches/server/0041-Reduce-entity-fluid-lookups-if-no-fluids.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Reduce entity fluid lookups if no fluids
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 91ca4e75cdaaba50865920c8bde794b1a72aea47..371b6428185be5b71b323adfd1d28e91b8e50545 100644
+index e459f015dd4b9543943b27e5f1c56a7ab8a787f8..881535ac0a034c381a88ae75cdb60699bdcae8f4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4042,16 +4042,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4046,16 +4046,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -34,7 +34,7 @@ index 91ca4e75cdaaba50865920c8bde794b1a72aea47..371b6428185be5b71b323adfd1d28e91
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -4059,14 +4061,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4063,14 +4065,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
  
@@ -102,7 +102,7 @@ index 91ca4e75cdaaba50865920c8bde794b1a72aea47..371b6428185be5b71b323adfd1d28e91
  
                              if (d2 >= axisalignedbb.minY) {
                                  flag1 = true;
-@@ -4088,9 +4137,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4092,9 +4141,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                                  // CraftBukkit end
                              }
                          }