Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
21faf822 Implement optional per player mobspawning (#2171)
88722ec8 Prevent consuming the wrong itemstack (#2477)
294e3046 Async chunk api/io/loading (#2308)

patches/server/0010-Integrate-ridables.patch

@@ -1,4 +1,4 @@
-From 022df48e1fb9475f3a6ff5f2baf2ab7e4ae8947c Mon Sep 17 00:00:00 2001
+From 676acbfb7f8a5a1ca13643a7c5509e34309749b1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 30 Apr 2019 19:17:21 -0500
 Subject: [PATCH] Integrate ridables
@@ -1253,7 +1253,7 @@ index 8e463111b..2c34ab337 100644
          this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F));
          this.goalSelector.a(2, new PathfinderGoalStrollVillage(this, 0.6D));
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index a661d109d..545283ed7 100644
+index 4b59f6081..d71fb40cb 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -87,10 +87,10 @@ public abstract class EntityLiving extends Entity {
@@ -2449,10 +2449,10 @@ index 0bd80e562..6bd2aeaad 100644
              if (this.h == ControllerMove.Operation.MOVE_TO && !this.i.getNavigation().n()) {
                  double d0 = this.b - this.i.locX;
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index e4fdf01dc..84aa1db72 100644
+index f8308c96b..f8600cc07 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
-@@ -265,6 +265,10 @@ public class EntityTypes<T extends Entity> {
+@@ -266,6 +266,10 @@ public class EntityTypes<T extends Entity> {
      }
  
      // Purpur start
@@ -3215,5 +3215,5 @@ index 56c233872..b19970c88 100644
 +    // Purpur end
  }
 -- 
-2.20.1
+2.23.0.rc1