Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@0baf2ff [ci skip] Allow .git to be a regular file (#8631)
PaperMC/Paper@5e6ac3c Properly identify golem spawn reason (#8635)
PaperMC/Paper@ec772bb Rabbit API (#8627)
PaperMC/Paper@7e5f85e Updated Upstream (CraftBukkit)
PaperMC/Paper@075fb67 Add eating regain reason for Camels (#8638)
PaperMC/Paper@812efd3 Fix chunksnapshot biome getter (#8639)
PaperMC/Paper@be50d5b Readd BlockBehavior inlining patch
PaperMC/Paper@7ba81b1 [ci skip] Fix leaf'd patch names
PaperMC/Paper@5bd8e1c Fix MapLike Codec missing key 'selector' (#8634)
PaperMC/Paper@7d18c6b Don't show particles when splash events are canceled (#8637)
PaperMC/Paper@ecfb76a Fix empty effect clouds from lingering potions (#8641)
PaperMC/Paper@1143b63 Add Position (#7639)
PaperMC/Paper@0bdbcd9 [ci skip] Remove non-functioning patch
PaperMC/Paper@d8cf30d Deprecate isPreview method in decorate events (#8645)
PaperMC/Paper@a5ecfd6 [ci skip] Correct chat preview removal version in javadoc (#8646)
PaperMC/Paper@eeeb8d5 Add the non-flammable wood item tag (#8648)
PaperMC/Paper@d2cb347 Fix items equipped on AbstractHorse losing NBT (#8647)

gradle.properties

@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19.3-R0.1-SNAPSHOT
 
-paperCommit = f6ffbc27206df240756c99ebc05fe31bbbfad910
+paperCommit = d2cb347f714a15e638100d06e9946921c184d4a2
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0006-Ridables.patch

@@ -174,7 +174,7 @@ index efce81deda7403d056628ab1a83f909af548b424..3f2813e32a1ea011f760d2df454b8875
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index a8e8cb8686a34ddd13c71261ffc40204ce6fefe3..e368ebc593653b10f79a06811f28f8cbcb953c18 100644
+index e5cd4b7609243669c9d84ff8a4988c209e6101aa..b5924bb104519f93328983f023b8e573e2a155ff 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -301,6 +301,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
@@ -1724,13 +1724,13 @@ index ce02552c1b3c62cf9f48425838a129a3ec40a049..71929e5fe8851ad5620f25b6ed505865
      protected void defineSynchedData() {
          super.defineSynchedData();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index e1cb50c31d18265c56f49461d79436f5fbe67f67..2579351192a47567a3b9a0e7653f02dcf61babb1 100644
+index 7a1fcae6de2dd8247fcb1f1612122edf8f56965a..db6521531517dbb06ff9aea4c1b5aa9c6bd858ac 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 @@ -83,6 +83,7 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
      private boolean wasOnGround;
      private int jumpDelayTicks;
-     int moreCarrotTicks;
+     public int moreCarrotTicks;
 +    private boolean actualJump; // Purpur
  
      public Rabbit(EntityType<? extends Rabbit> type, Level world) {
@@ -2516,7 +2516,7 @@ index e9f7c08ae3ea9c578971b1ede88788572c20e277..9b0a0736aa46e60f21c85cc88b67af34
          this.level.getProfiler().pop();
          this.level.getProfiler().push("goatActivityUpdate");
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-index 821b88d0c32f946af9af1c2e211b38446fab4ecb..a1f2648005f37101b641302e173eb6d6183c2773 100644
+index 72d660cd2ade39335024897cffb8b8a151a7cb71..ef5f059b51e330c801e1f0d5297c62ea9b77c637 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 @@ -118,12 +118,22 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@@ -5244,7 +5244,7 @@ index ae59a1259db4c4cef6f0cd128850229a63491845..b53d824bc0f964349e70097285700e5f
              event = new EntityDamageEvent(damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);
          }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 3fc92f92138d8223e18461758f5fe372b6552480..1da5e898ea5862dd5d1b1d3496132bf8f23caec7 100644
+index bd9ea8dfbd986c96000efb7dc36fc93d12a2c8b9..b0344a0baa22c4312ac9d1049b14671d932f76e2 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -172,4 +172,9 @@ public class PurpurConfig {

patches/server/0007-Configurable-entity-base-attributes.patch

@@ -331,7 +331,7 @@ index 71929e5fe8851ad5620f25b6ed5058653231d769..988093b46a4c386f8d47a4c530b8e9f6
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index 2579351192a47567a3b9a0e7653f02dcf61babb1..45f8e38bf4b4b446fe2ec056e31ffd05feaab929 100644
+index db6521531517dbb06ff9aea4c1b5aa9c6bd858ac..b3bfb94529dfaa912f0e5ce0965b0740f09cf55e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 @@ -135,6 +135,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
@@ -491,7 +491,7 @@ index 9b0a0736aa46e60f21c85cc88b67af342c34d5db..ee548f48f850e65542d8b0270881ad76
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-index a1f2648005f37101b641302e173eb6d6183c2773..68dd5611a3d7c943541e42b57457cf24fd2ea577 100644
+index ef5f059b51e330c801e1f0d5297c62ea9b77c637..5af2254b6dd380ad0822b47292940e08092f0eeb 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 @@ -129,6 +129,32 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@@ -527,7 +527,7 @@ index a1f2648005f37101b641302e173eb6d6183c2773..68dd5611a3d7c943541e42b57457cf24
      // Purpur end
  
      @Override
-@@ -1205,7 +1231,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
+@@ -1211,7 +1237,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
              entityData = new AgeableMob.AgeableMobGroupData(0.2F);
          }
  
@@ -1464,7 +1464,7 @@ index 0e7d5540763d56020cd59d9aef09f7a7d2cde1b1..7502940882edea11842b09de57094af3
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c2e8eb6b25b21ea3238c5df180e4deb8d59ab5b2..b411ba7283b8d6abf7cf53c3c82b612c801ebbee 100644
+index a258de586a26c43f0316468f0a49e2da94b690da..a85c9f24729ea44ef072a6d3d9ffeb93e8f0a486 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -113,94 +113,166 @@ public class PurpurWorldConfig {

patches/server/0013-LivingEntity-safeFallDistance.patch

@@ -37,10 +37,10 @@ index 10e7c382e3e25ede3452b02af0e4d538e9403061..d45cc25d37906ba0c2e5d80936aaae1d
  
      protected void playBlockFallSound() {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-index 68dd5611a3d7c943541e42b57457cf24fd2ea577..e6bb70dd641bad1f7cf0b946c922b59a9a43d2f8 100644
+index 5af2254b6dd380ad0822b47292940e08092f0eeb..8f27e6b495b82361d331c514c78088d358e4f5b4 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-@@ -341,7 +341,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
+@@ -347,7 +347,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
  
      @Override
      protected int calculateFallDamage(float fallDistance, float damageMultiplier) {