Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@9e614e6 Fix ground pathfinding (#7683)

gradle.properties

@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19.2-R0.1-SNAPSHOT
 
-paperCommit = 8db45c43121185f0e65cf31767ede2d79d2f4a65
+paperCommit = 9e614e6f9a1b625ba550a147266a474400c013c6
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0001-Pufferfish-Server-Changes.patch

@@ -2701,7 +2701,7 @@ index 0000000000000000000000000000000000000000..facd55463d44cb7e3d2ca6892982f549
 +	}
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 456595e4b7e0c7f50617aa2694b0d2dfc368ab81..bc72131afa1ae9986ee311a9b371e97c8feb38f8 100644
+index 96b68840ef5c7c726e4c8c2d9f907196561a94bf..2eb30c6c6f1354a559a7b8c14c36a9970bdf2a42 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -8,6 +8,7 @@ import net.kyori.adventure.text.Component;
@@ -3334,7 +3334,7 @@ index 540bc9500c35c0db719b00aa26f6fb3a1b08ed9f..806cb760822a99316b08ad95ff8922df
      int LARGE_MAX_STACK_SIZE = 64;
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0b3765ff8a25215bc42298b591eeffe022107079..417570c2ad71bc3727e7d5eb841a92ec815d12f6 100644
+index a3f1aef9d8f254747bd6580e8e3087a5c6829128..4971ec79a114fd0d7540eaa0ef54b18c4bfbea57 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -292,7 +292,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4092,7 +4092,7 @@ index 27cd393e81f6ef9b5690c051624d8d2af50acd34..33bee4233ba159d72a851d67b99836f8
                  Vec3 vec3 = this.path.getNextEntityPos(this.mob);
                  if (this.mob.getBlockX() == Mth.floor(vec3.x) && this.mob.getBlockY() == Mth.floor(vec3.y) && this.mob.getBlockZ() == Mth.floor(vec3.z)) {
 diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
-index f610c06d7bb51ec2c63863dd46711712986a106a..4842c0c0fb0e69bcb62b8335c65fc2fd944c83a7 100644
+index f0248d839255763005ba333b0bfcf691407fb69b..fcc40d8ff949bc7bb8a581133837ca93f53e8949 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
 @@ -15,6 +15,15 @@ import net.minecraft.world.level.pathfinder.WalkNodeEvaluator;
@@ -4127,10 +4127,10 @@ index f610c06d7bb51ec2c63863dd46711712986a106a..4842c0c0fb0e69bcb62b8335c65fc2fd
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
-index 3f672d7c2377fca16a6d8d31cf7aaae4f009fdce..aa3fbdaffd69d65d9522f82fab45d0475cae024f 100644
+index 02653adc591d390ca8b4ee13289510d4652c8894..cb4a162903207754be90ff8da0156f97791cccef 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
-@@ -151,6 +151,9 @@ public abstract class PathNavigation {
+@@ -150,6 +150,9 @@ public abstract class PathNavigation {
              return null;
          } else if (!this.canUpdatePath()) {
              return null;
@@ -4140,7 +4140,7 @@ index 3f672d7c2377fca16a6d8d31cf7aaae4f009fdce..aa3fbdaffd69d65d9522f82fab45d047
          } else if (this.path != null && !this.path.isDone() && positions.contains(this.targetPos)) {
              return this.path;
          } else {
-@@ -177,11 +180,28 @@ public abstract class PathNavigation {
+@@ -176,11 +179,28 @@ public abstract class PathNavigation {
              PathNavigationRegion pathNavigationRegion = new PathNavigationRegion(this.level, blockPos.offset(-i, -i, -i), blockPos.offset(i, i, i));
              Path path = this.pathFinder.findPath(pathNavigationRegion, this.mob, positions, followRange, distance, this.maxVisitedNodesMultiplier);
              this.level.getProfiler().pop();
@@ -4170,7 +4170,7 @@ index 3f672d7c2377fca16a6d8d31cf7aaae4f009fdce..aa3fbdaffd69d65d9522f82fab45d047
  
              return path;
          }
-@@ -228,8 +248,8 @@ public abstract class PathNavigation {
+@@ -227,8 +247,8 @@ public abstract class PathNavigation {
              if (this.isDone()) {
                  return false;
              } else {
@@ -4181,7 +4181,7 @@ index 3f672d7c2377fca16a6d8d31cf7aaae4f009fdce..aa3fbdaffd69d65d9522f82fab45d047
                      return false;
                  } else {
                      this.speedModifier = speed;
-@@ -253,9 +273,11 @@ public abstract class PathNavigation {
+@@ -252,9 +272,11 @@ public abstract class PathNavigation {
              this.recomputePath();
          }
  
@@ -4194,7 +4194,7 @@ index 3f672d7c2377fca16a6d8d31cf7aaae4f009fdce..aa3fbdaffd69d65d9522f82fab45d047
              } else if (this.path != null && !this.path.isDone()) {
                  Vec3 vec3 = this.getTempMobPos();
                  Vec3 vec32 = this.path.getNextEntityPos(this.mob);
-@@ -276,6 +298,13 @@ public abstract class PathNavigation {
+@@ -275,6 +297,13 @@ public abstract class PathNavigation {
          BlockPos blockPos = new BlockPos(pos);
          return this.level.getBlockState(blockPos.below()).isAir() ? pos.y : WalkNodeEvaluator.getFloorLevel(this.level, blockPos);
      }
@@ -4208,7 +4208,7 @@ index 3f672d7c2377fca16a6d8d31cf7aaae4f009fdce..aa3fbdaffd69d65d9522f82fab45d047
  
      protected void followThePath() {
          Vec3 vec3 = this.getTempMobPos();
-@@ -440,7 +469,7 @@ public abstract class PathNavigation {
+@@ -439,7 +468,7 @@ public abstract class PathNavigation {
      // Paper start
      public boolean isViableForPathRecalculationChecking() {
          return !this.needsPathRecalculation() &&

patches/server/0289-Remove-Mojang-Profiler.patch

@@ -1061,7 +1061,7 @@ index 5725c6593480fada65facc29664a00a8cc073512..ccb1f998ae3122d1856d77149ff7e7df
              };
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 34c823876efc78a5f5fe111b3d10e5240f76215f..ffbe6f3b5fdd60332627fdb6a7ea050d21ad8cdb 100644
+index cc355ddb74568717f28c74ab31566cd09c1209d7..2c7554a1dd092aca9dd1988b99f126630a968f5e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -821,7 +821,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1456,10 +1456,10 @@ index 0cc0d719e95e108263683b7a40f4ce3a8ca9465b..872ec431ae6beb0ef603d833f38aedb9
  
      public Set<WrappedGoal> getAvailableGoals() {
 diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
-index aa3fbdaffd69d65d9522f82fab45d0475cae024f..f8b0ed25718c766fe6a152e350a38ee0f3a4d230 100644
+index cb4a162903207754be90ff8da0156f97791cccef..9e6c4c2935e0a2cadfbf3da73eb4fe1881078c5a 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
-@@ -174,12 +174,12 @@ public abstract class PathNavigation {
+@@ -173,12 +173,12 @@ public abstract class PathNavigation {
                  }
              }
              // Paper end