Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
e1281a14 Configurable chance of villager zombie infection (Closes #2501)

current-paper

@@ -1 +1 @@
-1.15.2--de9e5516780d55a4b19bb73272429822dbb86abd
+1.15.2--6449bde28b63f5a90cbf7cccb3d6d9a5bc708ce6

patches/server/0093-Add-option-for-zombie-villager-transformation-chance.patch

@@ -1,55 +0,0 @@
-From 2673bb9948e9316b6ac9a44879ed0b0dafddc772 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Thu, 19 Dec 2019 16:59:46 -0600
-Subject: [PATCH] Add option for zombie villager transformation chance
-
----
- src/main/java/net/minecraft/server/EntityZombie.java | 11 +++++++++--
- src/main/java/net/pl3x/purpur/PurpurWorldConfig.java |  2 ++
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 1e60cc399b..8938dc50fe 100644
---- a/src/main/java/net/minecraft/server/EntityZombie.java
-+++ b/src/main/java/net/minecraft/server/EntityZombie.java
-@@ -474,10 +474,17 @@ public class EntityZombie extends EntityMonster {
-     @Override
-     public void b(EntityLiving entityliving) {
-         super.b(entityliving);
--        if ((this.world.getDifficulty() == EnumDifficulty.NORMAL || this.world.getDifficulty() == EnumDifficulty.HARD) && entityliving instanceof EntityVillager) {
--            if (this.world.getDifficulty() != EnumDifficulty.HARD && this.random.nextBoolean()) {
-+        // Purpur start
-+        if (entityliving instanceof EntityVillager) {
-+            double chance = world.purpurConfig.zombieVillagerTransformationChance;
-+            if (chance < 0) {
-+                if (world.getDifficulty() == EnumDifficulty.EASY || (world.getDifficulty() != EnumDifficulty.HARD && random.nextBoolean())) {
-+                    return;
-+                }
-+            } else if (chance == 0 || random.nextDouble() > chance) {
-                 return;
-             }
-+            // Purpur end
- 
-             EntityVillager entityvillager = (EntityVillager) entityliving;
-             EntityZombieVillager entityzombievillager = (EntityZombieVillager) EntityTypes.ZOMBIE_VILLAGER.a(this.world);
-diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e481e9639f..a9ec9d7b53 100644
---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -858,11 +858,13 @@ public class PurpurWorldConfig {
-     public boolean zombieRidableInWater = false;
-     public boolean zombieRequireShiftToMount = true;
-     public boolean zombieTargetTurtleEggs = true;
-+    public double zombieVillagerTransformationChance = -0.1D;
-     private void zombieSettings() {
-         zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
-         zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-         zombieRequireShiftToMount = getBoolean("mobs.zombie.require-shift-to-mount", zombieRequireShiftToMount);
-         zombieTargetTurtleEggs = getBoolean("mobs.zombie.target-turtle-eggs", zombieTargetTurtleEggs);
-+        zombieVillagerTransformationChance = getDouble("mobs.zombie.transform-to-villager-chance", zombieVillagerTransformationChance);
-     }
- 
-     public boolean zombieHorseCanSwim = false;
--- 
-2.24.0
-

patches/server/0093-Make-lava-flow-speed-configurable.patch

@@ -1,4 +1,4 @@
-From 6a6f1a08b487f7c5254b43d0adcefab0ed8b9384 Mon Sep 17 00:00:00 2001
+From 6fe11911eb836326ef2ef83a80ffbb5214f7ad57 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Jan 2020 11:31:36 -0600
 Subject: [PATCH] Make lava flow speed configurable
@@ -35,7 +35,7 @@ index 39252e6873..75f8441ab6 100644
          return this.d;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a9ec9d7b53..1ccb973d1d 100644
+index e481e9639f..9bac4c5eb4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -133,8 +133,12 @@ public class PurpurWorldConfig {

patches/server/0094-Add-wither-skeleton-takes-wither-damage-option.patch

@@ -1,4 +1,4 @@
-From 83d28c0aa09a48a505dc014d0ace88e160cfc38b Mon Sep 17 00:00:00 2001
+From 46a45841bc4726a74fed675fa635ad97763a363a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 14 Jan 2020 19:43:40 -0600
 Subject: [PATCH] Add wither skeleton takes wither damage option
@@ -21,7 +21,7 @@ index 8aa0a6699f..0fd740e717 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 1ccb973d1d..66c2ba43b2 100644
+index 9bac4c5eb4..6ae1c0fe02 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -843,10 +843,12 @@ public class PurpurWorldConfig {

patches/server/0095-UPnP-Port-Forwarding-Service.patch

@@ -1,4 +1,4 @@
-From 86ffbf216985518a0de899945c8ee73015222f62 Mon Sep 17 00:00:00 2001
+From 59a0084040ea302f8f8aa7fd92d1c80ba2f941af Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 22 Jan 2020 20:13:40 -0600
 Subject: [PATCH] UPnP Port Forwarding Service

patches/server/0096-Implement-EntityMoveEvent.patch

@@ -1,4 +1,4 @@
-From c68fd9e81577be8d7e275878cc5f12c9ff517092 Mon Sep 17 00:00:00 2001
+From 9ae921a7e3f7020c17df17a26ef302b48ddd88d6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 11 Feb 2020 21:56:48 -0600
 Subject: [PATCH] Implement EntityMoveEvent

patches/server/0097-Add-option-to-disable-saving-projectiles-to-disk.patch

@@ -1,4 +1,4 @@
-From 969d6a5bf207a7b4d842d7958bd65f392176d7ef Mon Sep 17 00:00:00 2001
+From b38ffc0b8dc85e24a1eff3eb11b3165cbd6d2ddf Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:07:08 -0600
 Subject: [PATCH] Add option to disable saving projectiles to disk
@@ -21,7 +21,7 @@ index d529b795c5..c6ea18ad75 100644
                      // Paper start
                      if ((int) Math.floor(entity.locX()) >> 4 != chunk.getPos().x || (int) Math.floor(entity.locZ()) >> 4 != chunk.getPos().z) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 66c2ba43b2..f0f9780959 100644
+index 6ae1c0fe02..3a530de7f9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -173,6 +173,7 @@ public class PurpurWorldConfig {

patches/server/0098-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch

@@ -1,4 +1,4 @@
-From 016b758382243e58414fd58453b2828c97e90c6a Mon Sep 17 00:00:00 2001
+From 14c3309df398c675f07b042f9ab4f73e3e0f7ba7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 21 Feb 2020 17:04:51 -0600
 Subject: [PATCH] Always increment arrow despawn counter (fixes MC-125757)

patches/server/0099-Implement-bed-explosion-options.patch

@@ -1,4 +1,4 @@
-From 7fcafb7204812206f4c94c5adc7b59cfba24114c Mon Sep 17 00:00:00 2001
+From 861e033fe31d24e8216ec52641acee335f477f28 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Feb 2020 15:04:29 -0600
 Subject: [PATCH] Implement bed explosion options
@@ -22,7 +22,7 @@ index 06a35629ab..df41a7dfcd 100644
                  // CraftBukkit end
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f0f9780959..52c65af2c7 100644
+index 3a530de7f9..9e16bf1431 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -3,6 +3,7 @@ package net.pl3x.purpur;

patches/server/0100-Add-item-entity-options.patch

@@ -1,4 +1,4 @@
-From 3c371f5440e3c02a1fe4f66c9e5aa15a3ca74ea0 Mon Sep 17 00:00:00 2001
+From 09525d14594e288727a544da2e67dd9279261e96 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Feb 2020 15:54:08 -0600
 Subject: [PATCH] Add item entity options
@@ -56,7 +56,7 @@ index bbb9ca1efc..262a7935e7 100644
              if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) {
                  return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 52c65af2c7..0346ad92f8 100644
+index 9e16bf1431..7e467230a7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -5,6 +5,8 @@ import net.minecraft.server.Block;

patches/server/0101-Make-natural-spawns-per-biome-configurable.patch

@@ -1,4 +1,4 @@
-From 50b267418a26ece5cb3f745a7b94c188e0769b28 Mon Sep 17 00:00:00 2001
+From 306d7b61aed9b32c3e189ddeed46aac03884e293 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 27 Feb 2020 13:39:06 -0600
 Subject: [PATCH] Make natural spawns per biome configurable

patches/server/0102-Configurable-void-damage-height.patch

@@ -1,4 +1,4 @@
-From 9a2eb77d5ec13921ace07f7862f8ff20102ea4cf Mon Sep 17 00:00:00 2001
+From aaac1acff680d1926eff0a74d6ec4c476c542a00 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 27 Feb 2020 21:42:19 -0600
 Subject: [PATCH] Configurable void damage height
@@ -22,7 +22,7 @@ index 0d509e8410..c85e794940 100644
              && this.locY >= world.paperConfig.netherVoidTopDamageHeight)) {
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0346ad92f8..20050a58b2 100644
+index 7e467230a7..0180d76845 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -198,6 +198,7 @@ public class PurpurWorldConfig {

patches/server/0103-Optimise-Chunk-getFluid.patch

@@ -1,4 +1,4 @@
-From f155dd4a2afbab9be3a982473d5fee3337a4ce65 Mon Sep 17 00:00:00 2001
+From 7000314ffa357b56e62c594132274fe7cdb815e4 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 14 Jan 2020 14:59:08 -0800
 Subject: [PATCH] Optimise Chunk#getFluid

patches/server/0104-Fix-the-dead-lagging-the-server.patch

@@ -1,4 +1,4 @@
-From 3fec0fc591b84c1f0185c12dada2bad4e37cf428 Mon Sep 17 00:00:00 2001
+From a261c8fdf00902ccd72fb9032cf0bb431977588d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 6 Mar 2020 13:37:26 -0600
 Subject: [PATCH] Fix the dead lagging the server

patches/server/0105-Flying-mobs-should-not-be-exempt-from-activation-ran.patch

@@ -1,4 +1,4 @@
-From 412166deffee0869daeee37302b482022afc3898 Mon Sep 17 00:00:00 2001
+From 6ff103bf87a9bca587647b5348519195ed77af6e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 8 Mar 2020 20:54:44 -0500
 Subject: [PATCH] Flying mobs should not be exempt from activation range