Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@1e7dd72 Remove 'fix Vanilla Minecart speed' patch (#10068)

Author: granny

gradle.properties

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.20.4-R0.1-SNAPSHOT
 
 mcVersion = 1.20.4
-paperCommit = b4c9e7e5d40fd4a0a7fea270fd4ebb72b38fa0fc
+paperCommit = 1e7dd72f15a1d13b43792367193547c656a16ab6
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0038-Minecart-settings-and-WASD-controls.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Minecart settings and WASD controls
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f862bd65b535fc9e289b31260af6990773336a5a..092808399b4450e2485d4cc3390a237ba809618a 100644
+index f9db41f311ad564380587bb2a0b69129e93ef87c..cf38a82b53d98aae4938fededcdad7d9110f3c40 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1111,6 +1111,7 @@ public class ServerPlayer extends Player {
@@ -17,12 +17,12 @@ index f862bd65b535fc9e289b31260af6990773336a5a..092808399b4450e2485d4cc3390a237b
 
              if (!flag && this.spawnInvulnerableTime > 0 && !source.is(DamageTypeTags.BYPASSES_INVULNERABILITY)) {
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-index 48b1cddfca671ac8bcb93a1b60518a4ee9e977e2..a52f8b583b84128b7d68bfced6c41e2c7554469c 100644
+index c906ca07509939a06b9aaf2da0dafb172830a638..d5e2797b392527de4027b20f29c73a16eb0d6af9 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
 @@ -105,12 +105,14 @@ public abstract class AbstractMinecart extends VehicleEntity {
-     private double flyingY = 0.949999988079071D; // Paper - restore vanilla precision
-     private double flyingZ = 0.949999988079071D; // Paper - restore vanilla precision
+     private double flyingY = 0.95;
+     private double flyingZ = 0.95;
      public double maxSpeed = 0.4D;
 +    public double storedMaxSpeed; // Purpur
      // CraftBukkit end