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/api/0017-PaperPR-PlayerItemCooldownEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] PaperPR - PlayerItemCooldownEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java
 new file mode 100644
-index 00000000..2002909f
+index 000000000..2002909f3
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java
 @@ -0,0 +1,77 @@

patches/api/0017-SkeletonHorseTrapEvent-getPlayer.patch

@@ -1,62 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 19 Oct 2019 02:35:24 -0500
-Subject: [PATCH] SkeletonHorseTrapEvent#getPlayer
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
-index d79dbcd6..1ed3ea8f 100644
---- a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
-+++ b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
-@@ -1,20 +1,30 @@
- package com.destroystokyo.paper.event.entity;
- 
-+import org.bukkit.entity.Player;
- import org.bukkit.entity.SkeletonHorse;
- import org.bukkit.event.Cancellable;
- import org.bukkit.event.HandlerList;
- import org.bukkit.event.entity.EntityEvent;
- import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
- 
- /**
-  * Event called when a player gets close to a skeleton horse and triggers the lightning trap
-  */
- public class SkeletonHorseTrapEvent extends EntityEvent implements Cancellable {
-     private static final HandlerList handlers = new HandlerList();
-+    private final Player player; // Purpur
-     private boolean cancelled;
- 
-     public SkeletonHorseTrapEvent(@NotNull SkeletonHorse horse) {
-+        // Purpur start
-+        this(horse, null);
-+    }
-+
-+    public SkeletonHorseTrapEvent(@NotNull SkeletonHorse horse, @Nullable Player player) {
-+        // Purpur end
-         super(horse);
-+        this.player = player; // Purpur
-     }
- 
-     @NotNull
-@@ -23,6 +33,20 @@ public class SkeletonHorseTrapEvent extends EntityEvent implements Cancellable {
-         return (SkeletonHorse) super.getEntity();
-     }
- 
-+    // Purpur start
-+    /**
-+     * Get the player that triggered this trap event
-+     * <p>
-+     * Null value if called by a plugin that does not support this feature
-+     *
-+     * @return Player that triggered event
-+     */
-+    @Nullable
-+    public Player getPlayer() {
-+        return player;
-+    }
-+    // Purpur end
-+
-     @Override
-     public boolean isCancelled() {
-         return cancelled;

patches/api/0018-EntityMoveEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] EntityMoveEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java b/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java
 new file mode 100644
-index 00000000..c48c525b
+index 000000000..c48c525b8
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java
 @@ -0,0 +1,95 @@

patches/api/0020-Anvil-API.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Anvil API
 
 diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
 new file mode 100644
-index 00000000..85663c0a
+index 000000000..85663c0a4
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
 @@ -0,0 +1,52 @@
@@ -64,7 +64,7 @@ index 00000000..85663c0a
 +}
 diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
 new file mode 100644
-index 00000000..2717ad82
+index 000000000..2717ad82c
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
 @@ -0,0 +1,35 @@
@@ -104,7 +104,7 @@ index 00000000..2717ad82
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/inventory/AnvilInventory.java b/src/main/java/org/bukkit/inventory/AnvilInventory.java
-index b95e563b..435026e5 100644
+index b95e563b5..435026e53 100644
 --- a/src/main/java/org/bukkit/inventory/AnvilInventory.java
 +++ b/src/main/java/org/bukkit/inventory/AnvilInventory.java
 @@ -109,4 +109,14 @@ public interface AnvilInventory extends Inventory {

patches/api/0021-ItemStack-convenience-methods.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack convenience methods
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 4ba991b7..a2e476f1 100644
+index 4ba991b79..a2e476f15 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -8645,4 +8645,36 @@ public enum Material implements Keyed {
@@ -46,7 +46,7 @@ index 4ba991b7..a2e476f1 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index ccd81fca..3fecde7a 100644
+index ccd81fca2..3fecde7a0 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;

patches/api/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index b4209175..83c51bb5 100644
+index b42091752..83c51bb5e 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 @@ -206,4 +206,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

patches/api/0023-ChatColor-conveniences.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] ChatColor conveniences
 
 
 diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
-index 4594701d..499b222d 100644
+index 4594701d7..499b222de 100644
 --- a/src/main/java/org/bukkit/ChatColor.java
 +++ b/src/main/java/org/bukkit/ChatColor.java
 @@ -413,4 +413,30 @@ public enum ChatColor {

patches/api/0024-DragonEggPlaceEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] DragonEggPlaceEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/block/DragonEggPlaceEvent.java b/src/main/java/net/pl3x/purpur/event/block/DragonEggPlaceEvent.java
 new file mode 100644
-index 00000000..bdabfd2b
+index 000000000..bdabfd2b5
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/block/DragonEggPlaceEvent.java
 @@ -0,0 +1,47 @@

patches/api/0026-Configurable-permission-message-upgrades.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable permission message upgrades
 This allows the configurable permission message in paper.yml to be blank and also support newlines
 
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index c10fc8d2..882c565a 100644
+index c10fc8d23..882c565ac 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -184,9 +184,13 @@ public abstract class Command {

patches/api/0028-Item-entity-immunities.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Item entity immunities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
-index 0ee07264..bc1f3f1c 100644
+index 0ee072645..bc1f3f1c6 100644
 --- a/src/main/java/org/bukkit/entity/Item.java
 +++ b/src/main/java/org/bukkit/entity/Item.java
 @@ -120,4 +120,34 @@ public interface Item extends Entity {