diff --git a/gradle.properties b/gradle.properties
index 34458fa6e..0a3378efa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.20.2-R0.1-SNAPSHOT
 
 mcVersion = 1.20.2
-paperCommit = 38b7565d9ecd0fd0ac6b63014e94da75e2db362a
+paperCommit = 9c126fd2a976c1557d418f4ccce532f8ad62042b
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0007-Ridables.patch b/patches/api/0007-Ridables.patch
index c52fb6969..abbe71a59 100644
--- a/patches/api/0007-Ridables.patch
+++ b/patches/api/0007-Ridables.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Ridables
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index b7a2cecb334ce39fa09d8ab949a29eedbdc44c36..6f55ccfff74b361854bf424fd93f0428e66a6bd7 100644
+index 0c4dbb9ef63fa8575b5546239443cb2bd91ba847..4160e968e7d7e8e2a953534a981a7330916ece2e 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -201,6 +201,12 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+@@ -198,6 +198,12 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
      GoalKey<Mob> CLIMB_ON_TOP_OF_POWDER_SNOW = GoalKey.of(Mob.class, NamespacedKey.minecraft("climb_on_top_of_powder_snow"));
      GoalKey<Wolf> WOLF_PANIC = GoalKey.of(Wolf.class, NamespacedKey.minecraft("wolf_panic"));
  
@@ -19,7 +19,7 @@ index b7a2cecb334ce39fa09d8ab949a29eedbdc44c36..6f55ccfff74b361854bf424fd93f0428
 +    // Purpur end
 +
      /**
-      * @deprecated removed in 1.16
+      * @deprecated removed in 1.20.2
       */
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
 index 762cb07861ca8ff058ce8d57ea6c15df1e588bf3..de60e8773e58ef62c15d8f7e293313a62dff674b 100644
diff --git a/patches/api/0018-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/api/0018-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
index 44337b14f..a25cc3934 100644
--- a/patches/api/0018-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/api/0018-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 6f55ccfff74b361854bf424fd93f0428e66a6bd7..038b990fcd72847e7ea43eda3c24c4ce1a3d5bc4 100644
+index 4160e968e7d7e8e2a953534a981a7330916ece2e..68326105d2e11bd2d94315c0da35a32d1510de08 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -205,6 +205,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+@@ -202,6 +202,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
      GoalKey<Mob> MOB_HAS_RIDER = GoalKey.of(Mob.class, NamespacedKey.minecraft("has_rider"));
      GoalKey<AbstractHorse> HORSE_HAS_RIDER = GoalKey.of(AbstractHorse.class, NamespacedKey.minecraft("horse_has_rider"));
      GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
diff --git a/patches/api/0022-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/api/0022-Add-option-to-disable-zombie-aggressiveness-towards-.patch
index 60a235185..bcfee5bb1 100644
--- a/patches/api/0022-Add-option-to-disable-zombie-aggressiveness-towards-.patch
+++ b/patches/api/0022-Add-option-to-disable-zombie-aggressiveness-towards-.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add option to disable zombie aggressiveness towards villagers
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 038b990fcd72847e7ea43eda3c24c4ce1a3d5bc4..150aa7b0876b50e2e92bab18721c548b8e6d5515 100644
+index 68326105d2e11bd2d94315c0da35a32d1510de08..ce2eb58b86cd638d91f2bf9a8da60db499685fc9 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -207,6 +207,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+@@ -204,6 +204,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
      GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
      GoalKey<Phantom> FIND_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("find_crystal"));
      GoalKey<Phantom> ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal"));
diff --git a/patches/api/0024-Rabid-Wolf-API.patch b/patches/api/0024-Rabid-Wolf-API.patch
index ae345b5d7..6814613b5 100644
--- a/patches/api/0024-Rabid-Wolf-API.patch
+++ b/patches/api/0024-Rabid-Wolf-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Rabid Wolf API
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 150aa7b0876b50e2e92bab18721c548b8e6d5515..54ecf2998eb7ee711fb56e3d8ed3f49129db4147 100644
+index ce2eb58b86cd638d91f2bf9a8da60db499685fc9..8671b9042df2e219921615144a6ca868fa346d77 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -209,6 +209,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+@@ -206,6 +206,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
      GoalKey<Phantom> ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal"));
      GoalKey<Drowned> DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager"));
      GoalKey<Zombie> ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager"));
diff --git a/patches/api/0029-Iron-golem-poppy-calms-anger.patch b/patches/api/0029-Iron-golem-poppy-calms-anger.patch
index 03f75e7c6..0f9201a9e 100644
--- a/patches/api/0029-Iron-golem-poppy-calms-anger.patch
+++ b/patches/api/0029-Iron-golem-poppy-calms-anger.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Iron golem poppy calms anger
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 54ecf2998eb7ee711fb56e3d8ed3f49129db4147..b1f35c68373edfe666ca05b50f0ec022a1859ce9 100644
+index 8671b9042df2e219921615144a6ca868fa346d77..b347224c223569297ee67ac630a710fdf28748ea 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -210,6 +210,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+@@ -207,6 +207,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
      GoalKey<Drowned> DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager"));
      GoalKey<Zombie> ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager"));
      GoalKey<Wolf> AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf"));