Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
9a129fa99 Add #getEligibleHumans to SkeletonHorseTrapEvent
b5e23c7a6 Fix merging spawning values
a932e8ad7 Turn off spigot verbose world by default
8ced89f65 Fix Delegation to vanilla chunk gen

patches/server/0040-Add-option-to-set-armorstand-step-height.patch

@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 6 Oct 2019 12:46:35 -0500
-Subject: [PATCH] Add option to set armorstand step height
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 8fef94ad9a..df3fc83029 100644
---- a/src/main/java/net/minecraft/server/EntityArmorStand.java
-+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
-@@ -618,6 +618,7 @@ public class EntityArmorStand extends EntityLiving {
- 
-     @Override
-     public void tick() {
-+        setStepHeight(world.purpurConfig.armorstandStepHeight); // Purpur
-         // Paper start
-         if (!this.canTick) {
-             if (this.noTickPoseDirty) {
-diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 95e801ce26..f01c74a2ea 100644
---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -63,6 +63,11 @@ public class PurpurWorldConfig {
-         return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
-     }
- 
-+    public float armorstandStepHeight = 0.0F;
-+    private void armorstandSettings() {
-+        armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
-+    }
-+
-     public boolean idleTimeoutKick = true;
-     public boolean idleTimeoutTickNearbyEntities = true;
-     public boolean idleTimeoutCountAsSleeping = false;