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

current-paper

@@ -1 +1 @@
-1.16.4--46641b1f6d9966cc98064774660ecdad7bb53e07
+1.16.4--194240a416a31a579f4007bf9c85794e9f3bdb26

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 {

patches/server/0001-Tuinity-Server-Changes.patch

@@ -8761,10 +8761,10 @@ index 25e54a1fad..cce0ac8a36 100644
          return this.d(entity, axisalignedbb, predicate).allMatch(VoxelShape::isEmpty);
          } finally { if (entity != null) entity.collisionLoadChunks = false; } // Paper
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index 07dbdd5609..40ca3364d4 100644
+index 2639c17b7f..cbaf18af10 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
-@@ -52,16 +52,26 @@ public interface IEntityAccess {
+@@ -55,16 +55,26 @@ public interface IEntityAccess {
          return this.b(oclass, axisalignedbb, IEntitySelector.g);
      }
  
@@ -8793,7 +8793,7 @@ index 07dbdd5609..40ca3364d4 100644
                      label25:
                      {
                          if (entity == null) {
-@@ -79,7 +89,7 @@ public interface IEntityAccess {
+@@ -82,7 +92,7 @@ public interface IEntityAccess {
  
                  flag = false;
                  return flag;
@@ -8802,7 +8802,7 @@ index 07dbdd5609..40ca3364d4 100644
          }
      }
  
-@@ -179,12 +189,12 @@ public interface IEntityAccess {
+@@ -204,12 +214,12 @@ public interface IEntityAccess {
      }
  
      @Nullable
@@ -14676,7 +14676,7 @@ index 5ccdc0b87b..888dae2d5e 100644
  
                          try {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4e1b4d7cde..9bf854b5a2 100644
+index 0aa1da6cc1..89a654b472 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -232,7 +232,7 @@ import javax.annotation.Nullable; // Paper
@@ -14716,7 +14716,7 @@ index 4e1b4d7cde..9bf854b5a2 100644
      }
  
      @Override
-@@ -2272,6 +2277,14 @@ public final class CraftServer implements Server {
+@@ -2275,6 +2280,14 @@ public final class CraftServer implements Server {
              return com.destroystokyo.paper.PaperConfig.config;
          }
  

patches/server/0003-Purpur-config-files.patch

@@ -373,7 +373,7 @@ index 0000000000..4904be939c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 260d3513ec..51ef4ab09e 100644
+index 991a799148..53ed0465a9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -857,6 +857,7 @@ public final class CraftServer implements Server {
@@ -400,7 +400,7 @@ index 260d3513ec..51ef4ab09e 100644
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2285,6 +2288,18 @@ public final class CraftServer implements Server {
+@@ -2288,6 +2291,18 @@ public final class CraftServer implements Server {
          }
          // Tuinity end - add config to timings report
  
@@ -420,7 +420,7 @@ index 260d3513ec..51ef4ab09e 100644
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index a9c96d45c6..b65629cac7 100644
+index d2ec9f7f10..b3c0ba202d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -146,6 +146,14 @@ public class Main {

patches/server/0009-AFK-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index caaa01b20..335cb9c4a 100644
+index caaa01b20e..335cb9c4a9 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -84,6 +84,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -25,7 +25,7 @@ index caaa01b20..335cb9c4a 100644
          super(EntityTypes.PLAYER, world);
          this.bL = ItemStack.b;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 27c368bf1..694159cca 100644
+index 27c368bf19..694159cca7 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1891,8 +1891,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -84,10 +84,10 @@ index 27c368bf1..694159cca 100644
          return this.serverStatisticManager;
      }
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index 40ca3364d..9643dffc5 100644
+index cbaf18af10..0c98a43602 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
-@@ -149,28 +149,18 @@ public interface IEntityAccess {
+@@ -174,28 +174,18 @@ public interface IEntityAccess {
      }
      // Paper end
  
@@ -129,7 +129,7 @@ index 40ca3364d..9643dffc5 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index 31eb6868c..9f9d9b2de 100644
+index b5e1a860a2..5f85a1d513 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@@ -140,12 +140,7 @@ index 31eb6868c..9f9d9b2de 100644
      public static final Predicate<EntityLiving> b = EntityLiving::isAlive;
      public static final Predicate<Entity> c = (entity) -> {
          return entity.isAlive() && !entity.isVehicle() && !entity.isPassenger();
-@@ -22,10 +23,12 @@ public final class IEntitySelector {
-     public static final Predicate<Entity> f = (entity) -> {
-         return !(entity instanceof EntityHuman) || !entity.isSpectator() && !((EntityHuman) entity).isCreative() && entity.world.getDifficulty() != EnumDifficulty.PEACEFUL;
-     };
-+    public static Predicate<Entity> notSpectator() { return g; } // Purpur - OBFHELPER
-     public static final Predicate<Entity> g = (entity) -> {
+@@ -27,6 +28,7 @@ public final class IEntitySelector {
          return !entity.isSpectator();
      };
      public static Predicate<EntityHuman> isInsomniac = (player) -> MathHelper.clamp(((EntityPlayer) player).getStatisticManager().getStatisticValue(StatisticList.CUSTOM.get(StatisticList.TIME_SINCE_REST)), 1, Integer.MAX_VALUE) >= 72000; // Paper
@@ -154,7 +149,7 @@ index 31eb6868c..9f9d9b2de 100644
      // Paper start
      public static final Predicate<Entity> affectsSpawning = (entity) -> {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 12ce5b106..13da04e5b 100644
+index 12ce5b106d..13da04e5b3 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -247,6 +247,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -198,7 +193,7 @@ index 12ce5b106..13da04e5b 100644
                                      if (from.getX() != Double.MAX_VALUE) {
                                          Location oldTo = to.clone();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0ac1bd39a..18e4fe468 100644
+index bb310c7451..e082faf8cf 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -834,7 +834,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -220,7 +215,7 @@ index 0ac1bd39a..18e4fe468 100644
                  } else if (entityplayer.isSleeping()) {
                      ++j;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 803a7ff92..d699a9168 100644
+index 147e5bf0dc..6b896b7d46 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,6 +1,7 @@
@@ -248,7 +243,7 @@ index 803a7ff92..d699a9168 100644
      private static void timingsSettings() {
          timingsUrl = getString("settings.timings.url", timingsUrl);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 361f7857e..2578a4677 100644
+index 361f7857e4..2578a4677d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -56,4 +56,15 @@ public class PurpurWorldConfig {
@@ -268,7 +263,7 @@ index 361f7857e..2578a4677 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f4f4e29f5..93c8f9fc8 100644
+index 58caa3240b..6d97bcffb6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2216,4 +2216,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -294,7 +289,7 @@ index f4f4e29f5..93c8f9fc8 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 0b93635ba..b47d6fa2d 100644
+index 0b93635ba5..b47d6fa2de 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -207,6 +207,7 @@ public class ActivationRange

patches/server/0010-Bring-back-server-name.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bring back server name
 
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
-index 23f8e144fc..6797fa2e8c 100644
+index 65961a0372..780474397a 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
 @@ -10,6 +10,7 @@ public class DedicatedServerProperties extends PropertyManager<DedicatedServerPr
@@ -17,10 +17,10 @@ index 23f8e144fc..6797fa2e8c 100644
      public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
      public final boolean pvp = this.getBoolean("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 51ef4ab09e..d61062fa64 100644
+index 53ed0465a9..2df140c9bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2437,4 +2437,11 @@ public final class CraftServer implements Server {
+@@ -2440,4 +2440,11 @@ public final class CraftServer implements Server {
          return mobGoals;
      }
      // Paper end

patches/server/0013-Lagging-threshold.patch

@@ -41,10 +41,10 @@ index 85bdb83afa..bdf5a77eb3 100644
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d61062fa64..15abd94340 100644
+index 2df140c9bb..4acc9ca619 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2443,5 +2443,10 @@ public final class CraftServer implements Server {
+@@ -2446,5 +2446,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return getProperties().serverName;
      }

patches/server/0017-SkeletonHorseTrapEvent-getPlayer.patch

@@ -1,36 +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:35 -0500
-Subject: [PATCH] SkeletonHorseTrapEvent#getPlayer
-
-
-diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index 6a9af67d0..c10a37fe1 100644
---- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-+++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-@@ -2,7 +2,8 @@ package net.minecraft.server;
- 
- public class PathfinderGoalHorseTrap extends PathfinderGoal {
- 
--    private final EntityHorseSkeleton a;
-+    private final EntityHorseSkeleton a; public EntityHorseSkeleton getHorse() { return a; } // Purpur - OBFHELPER
-+    private EntityHuman player; // Purpur
- 
-     public PathfinderGoalHorseTrap(EntityHorseSkeleton entityhorseskeleton) {
-         this.a = entityhorseskeleton;
-@@ -10,13 +11,13 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
- 
-     @Override
-     public boolean a() {
--        return this.a.world.isPlayerNearby(this.a.locX(), this.a.locY(), this.a.locZ(), 10.0D);
-+        return (player = getHorse().world.findNearbyPlayer(getHorse(), 10.0D)) != null; // Purpur
-     }
- 
-     @Override
-     public void e() {
-         WorldServer worldserver = (WorldServer) this.a.world;
--        if (!new com.destroystokyo.paper.event.entity.SkeletonHorseTrapEvent((org.bukkit.entity.SkeletonHorse) this.a.getBukkitEntity()).callEvent()) return; // Paper
-+        if (!new com.destroystokyo.paper.event.entity.SkeletonHorseTrapEvent((org.bukkit.entity.SkeletonHorse) this.a.getBukkitEntity(), (org.bukkit.entity.Player) player.getBukkitEntity()).callEvent()) return; // Paper // Purpur
-         DifficultyDamageScaler difficultydamagescaler = worldserver.getDamageScaler(this.a.getChunkCoordinates());
- 
-         this.a.t(false);

patches/server/0021-Alternative-Keepalive-Handling.patch

@@ -68,7 +68,7 @@ index 11473f06be..32bfd0e222 100644
          if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) {
              int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 263042d7fb..07f558d0d2 100644
+index bdf5a77eb3..1443034d21 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -154,6 +154,11 @@ public class PurpurConfig {

patches/server/0022-Silk-touch-spawners.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Silk touch spawners
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockMobSpawner.java b/src/main/java/net/minecraft/server/BlockMobSpawner.java
-index 81e145ff0..91b92d95a 100644
+index 81e145ff07..91b92d95a9 100644
 --- a/src/main/java/net/minecraft/server/BlockMobSpawner.java
 +++ b/src/main/java/net/minecraft/server/BlockMobSpawner.java
 @@ -1,5 +1,14 @@
@@ -93,7 +93,7 @@ index 81e145ff0..91b92d95a 100644
          return i;
 diff --git a/src/main/java/net/minecraft/server/ItemSpawner.java b/src/main/java/net/minecraft/server/ItemSpawner.java
 new file mode 100644
-index 000000000..5c7f73918
+index 0000000000..5c7f739185
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/ItemSpawner.java
 @@ -0,0 +1,23 @@
@@ -121,7 +121,7 @@ index 000000000..5c7f73918
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Items.java b/src/main/java/net/minecraft/server/Items.java
-index 1c861bccc..67ebcbe4d 100644
+index 1c861bccc2..67ebcbe4da 100644
 --- a/src/main/java/net/minecraft/server/Items.java
 +++ b/src/main/java/net/minecraft/server/Items.java
 @@ -180,7 +180,7 @@ public class Items {
@@ -134,7 +134,7 @@ index 1c861bccc..67ebcbe4d 100644
      public static final Item cy = a(Blocks.CHEST, CreativeModeTab.c);
      public static final Item cz = a(Blocks.DIAMOND_ORE, CreativeModeTab.b);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c7fb5a737..ba89efb31 100644
+index c7fb5a737c..ba89efb315 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1,6 +1,12 @@

patches/server/0024-MC-4-Fix-Item-position-desync.patch

@@ -39,7 +39,7 @@ index e5da2b19c1..6d9d52e4fc 100644
          return (new Vec3D((double) i, (double) j, (double) k)).a(2.44140625E-4D);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 07f558d0d2..ba2006fe08 100644
+index 1443034d21..55416be665 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -177,4 +177,9 @@ public class PurpurConfig {

patches/server/0026-Logger-settings-suppressing-pointless-logs.patch

@@ -17,7 +17,7 @@ index c680319e40..eaa1063ff2 100644
                              }
                              // CraftBukkit end
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index ba2006fe08..1b6b265e60 100644
+index 55416be665..70a53c9283 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -182,4 +182,11 @@ public class PurpurConfig {

patches/server/0027-Disable-outdated-build-check.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable outdated build check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index b65629cac7..71f8435e4a 100644
+index b3c0ba202d..a5394b04a6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -259,7 +259,7 @@ public class Main {

patches/server/0035-Dont-send-useless-entity-packets.patch

@@ -61,7 +61,7 @@ index 6d9d52e4fc..0010448e3a 100644
      protected boolean h;
      protected boolean i;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 1b6b265e60..fd2bf433a1 100644
+index 70a53c9283..62cb13d1fa 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -178,6 +178,11 @@ public class PurpurConfig {

patches/server/0040-Cat-spawning-options.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Cat spawning options
 
 
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index 9643dffc59..d9e6e78b15 100644
+index 0c98a43602..08778cc0de 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
-@@ -44,6 +44,7 @@ public interface IEntityAccess {
+@@ -47,6 +47,7 @@ public interface IEntityAccess {
          }
      }
  

patches/server/0080-Add-5-second-tps-average-in-tps.patch

@@ -47,10 +47,10 @@ index 0f9c6b964f..c339c57b07 100644
                          lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
                          tickSection = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 15abd94340..41f88479a6 100644
+index 4acc9ca619..3dec164f64 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2235,6 +2235,7 @@ public final class CraftServer implements Server {
+@@ -2238,6 +2238,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {

patches/server/0083-Add-ping-command.patch

@@ -67,7 +67,7 @@ index 86f1cfe454..da53af61d1 100644
          if (!(this.k instanceof EntityPlayer)) {
              throw CommandListenerWrapper.a.create();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index e83a9632a7..f01da7be2a 100644
+index 1c6265818b..68b3f1def3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -133,10 +133,12 @@ public class PurpurConfig {

patches/server/0087-Add-phantom-spawning-options.patch

@@ -221,10 +221,10 @@ index 4e3f01bc79..ac1ea2f0c1 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 6c15409982..8eadfae52c 100644
+index 661ad8f8e6..ee91c33a7a 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
-@@ -387,6 +387,7 @@ public final class SpawnerCreature {
+@@ -385,6 +385,7 @@ public final class SpawnerCreature {
          return new BlockPosition(i, l, j);
      }
  

patches/server/0090-Add-allow-water-in-end-world-option.patch

@@ -68,7 +68,7 @@ index a8571dae8d..7a82a894bb 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index f01da7be2a..cec0f9d749 100644
+index 68b3f1def3..cb7ea33361 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,7 +1,6 @@