diff --git a/gradle.properties b/gradle.properties
index 3afec4ae4..261bc30b4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19-R0.1-SNAPSHOT
 
-paperCommit = 04d080ed82e7e2cf859bcec98b76a51fc7274893
+paperCommit = 37afe987d9fff5af72ea6f16807aa271fe70fbf1
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0008-Ridables.patch b/patches/server/0008-Ridables.patch
index e0007009a..b1ac80825 100644
--- a/patches/server/0008-Ridables.patch
+++ b/patches/server/0008-Ridables.patch
@@ -4941,10 +4941,10 @@ index 769e4fbaac01a4fe3a45bd9cab5c63b61fc69f53..ff149234a8f3e1c94961e41d5bc81174
          this.level.getProfiler().pop();
          PiglinBruteAi.updateActivity(this);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-index cd6fb81d14706217c92fccc7853afce4010dfd1b..d41a559531b024f8c873b2b3e56fed1336f4bb2f 100644
+index 27bd70dc30c8472e5a80f3273f9233a0392f831d..54959365ffc81d305d07562fc5677cbb9fb97d2b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-@@ -118,8 +118,32 @@ public class Warden extends Monster implements VibrationListener.VibrationListen
+@@ -120,8 +120,32 @@ public class Warden extends Monster implements VibrationListener.VibrationListen
          this.setPathfindingMalus(BlockPathTypes.LAVA, 8.0F);
          this.setPathfindingMalus(BlockPathTypes.DAMAGE_FIRE, 0.0F);
          this.setPathfindingMalus(BlockPathTypes.DANGER_FIRE, 0.0F);
@@ -4976,15 +4976,30 @@ index cd6fb81d14706217c92fccc7853afce4010dfd1b..d41a559531b024f8c873b2b3e56fed13
 +
      @Override
      public Packet<?> getAddEntityPacket() {
-         return new ClientboundAddEntityPacket((LivingEntity)this, this.hasPose(Pose.EMERGING) ? 1 : 0);
-@@ -391,6 +415,7 @@ public class Warden extends Monster implements VibrationListener.VibrationListen
+         return new ClientboundAddEntityPacket(this, this.hasPose(Pose.EMERGING) ? 1 : 0);
+@@ -403,19 +427,16 @@ public class Warden extends Monster implements VibrationListener.VibrationListen
  
      @Contract("null->false")
      public boolean canTargetEntity(@Nullable Entity entity) {
+-        boolean flag;
+-
 +        if (getRider() != null && isControllable()) return false; // Purpur
-         if (entity instanceof LivingEntity livingEntity) {
-             if (this.level == entity.level && EntitySelector.NO_CREATIVE_OR_SPECTATOR.test(entity) && !this.isAlliedTo(entity) && livingEntity.getType() != EntityType.ARMOR_STAND && livingEntity.getType() != EntityType.WARDEN && !livingEntity.isInvulnerable() && !livingEntity.isDeadOrDying() && this.level.getWorldBorder().isWithinBounds(livingEntity.getBoundingBox())) {
-                 return true;
+         if (entity instanceof LivingEntity) {
+             LivingEntity entityliving = (LivingEntity) entity;
+ 
+             if (this.level == entity.level && EntitySelector.NO_CREATIVE_OR_SPECTATOR.test(entity) && !this.isAlliedTo(entity) && entityliving.getType() != EntityType.ARMOR_STAND && entityliving.getType() != EntityType.WARDEN && !entityliving.isInvulnerable() && !entityliving.isDeadOrDying() && this.level.getWorldBorder().isWithinBounds(entityliving.getBoundingBox())) {
+-                flag = true;
+-                return flag;
++                return true; // Purpur - wtf
+             }
+         }
+ 
+-        flag = false;
+-        return flag;
++        return false; // Purpur - wtf
+     }
+ 
+     public static void applyDarknessAround(ServerLevel world, Vec3 pos, @Nullable Entity entity, int range) {
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 index 93077e8c6b5a35adc6febb749d1d08be172402f1..a6519bf96f39fa69ecb65ef25dba80261bb03323 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java