diff --git a/gradle.properties b/gradle.properties
index 4d96fd185..4dae0c448 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.18.2-R0.1-SNAPSHOT
 
-paperCommit = 935151388a864cc78c6b9241c90bc4a576939be3
+paperCommit = 6564f70f4c569e46f3320c284b4fead197fccd05
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0006-Ridables.patch b/patches/server/0006-Ridables.patch
index 0dd75d525..7a0a5efa6 100644
--- a/patches/server/0006-Ridables.patch
+++ b/patches/server/0006-Ridables.patch
@@ -4903,19 +4903,6 @@ index 4132c1113f5437a776e5e3c1cb306904775aed88..1a945a32c3d3705a318ebca72a365931
      @Override
      public void tick() {
          super.tick();
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 4759a6b3d3cd7973744562adf97d110d359ebce3..cfb43f277c013680a0e51fb93796e38f88b506db 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-@@ -35,7 +35,7 @@ public abstract class Projectile extends Entity {
-     private boolean hasBeenShot;
- 
-     // CraftBukkit start
--    private boolean hitCancelled = false;
-+    public boolean hitCancelled = false; // Purpur - private -> public
-     // CraftBukkit end
- 
-     Projectile(EntityType<? extends Projectile> type, Level world) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 index a92755211e3d42934b5efaa3f201c6c19ab7d2b4..318456621faf484dbad479b2873ae647e0c0f037 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
diff --git a/patches/server/0099-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0099-Despawn-rate-config-options-per-projectile-type.patch
index 3436baff8..18fd6814e 100644
--- a/patches/server/0099-Despawn-rate-config-options-per-projectile-type.patch
+++ b/patches/server/0099-Despawn-rate-config-options-per-projectile-type.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Despawn rate config options per projectile type
 Default values of -1 respect vanilla behaviour.
 
 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 3d3dcb47720055f550d17d1f106a2c0e59de2919..0766645bf1e749fadd43077d6cff392ad02ace68 100644
+index 53d0024daf6963ac4dab575666b0d6a74a39a958..2772351085add7d25c39bd9e5537fe354d07e9e1 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -62,7 +62,7 @@ public abstract class AbstractArrow extends Projectile {
@@ -18,7 +18,7 @@ index 3d3dcb47720055f550d17d1f106a2c0e59de2919..0766645bf1e749fadd43077d6cff392a
      private double baseDamage;
      public int knockback;
      private SoundEvent soundEvent;
-@@ -320,12 +320,23 @@ public abstract class AbstractArrow extends Projectile {
+@@ -333,12 +333,23 @@ public abstract class AbstractArrow extends Projectile {
  
      }
  
@@ -127,7 +127,7 @@ index 1a945a32c3d3705a318ebca72a365931a8c001b7..c7fdcfae1ba823046fdfe78aa97b4a7a
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index cfb43f277c013680a0e51fb93796e38f88b506db..97609bedb82dee6a200ff8b825622c427d7dcf73 100644
+index 0c7d31c7ffd603e54fb19010331ad220c7b15627..73d18318afff5eac5966ddaeadf014524d06ec66 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -33,6 +33,7 @@ public abstract class Projectile extends Entity {
@@ -137,7 +137,7 @@ index cfb43f277c013680a0e51fb93796e38f88b506db..97609bedb82dee6a200ff8b825622c42
 +    public int life; // Purpur - moved from AbstractArrow
  
      // CraftBukkit start
-     public boolean hitCancelled = false; // Purpur - private -> public
+     protected boolean hitCancelled = false;
 @@ -72,6 +73,19 @@ public abstract class Projectile extends Entity {
      }
      // Pufferfish start
diff --git a/patches/server/0108-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0108-Arrows-should-not-reset-despawn-counter.patch
index e915959ea..9add48974 100644
--- a/patches/server/0108-Arrows-should-not-reset-despawn-counter.patch
+++ b/patches/server/0108-Arrows-should-not-reset-despawn-counter.patch
@@ -7,10 +7,10 @@ This prevents keeping arrows alive indefinitely (such as when the block
 the arrow is stuck in gets removed, like a piston head going up/down)
 
 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 0766645bf1e749fadd43077d6cff392ad02ace68..5f19571e59251a9072b29c600e075c232fb1f048 100644
+index 2772351085add7d25c39bd9e5537fe354d07e9e1..59e434c31d1929bdc1d5242ef1f117d998ca46ec 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-@@ -308,7 +308,7 @@ public abstract class AbstractArrow extends Projectile {
+@@ -321,7 +321,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)));