Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
a6ac47e5 Fix numerous item duplication issues and teleport issues
b7402f11 Add phantom creative and insomniac controls (#3222)
75819fac Fix Potion#toItemStack swapping the extended and upgraded constructor values (#3216)

Author: BillyGalbreath

Paper

@@ -1 +1 @@
-1.15.2--a7c28f72fefc928e28132ad32a50dfe316123df8
+1.15.2--167bedd58018498c1428e97ea328d4d61f5e7e7a

current-paper

@@ -1,4 +1,4 @@
-From 707495df9c96f138d460f413d17bf17916d02d8b Mon Sep 17 00:00:00 2001
+From 59166b4adddd81bd0000487ca5d07c6f360a8c90 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 01:10:30 -0500
 Subject: [PATCH] Cows eat mushrooms
@@ -11,7 +11,7 @@ Subject: [PATCH] Cows eat mushrooms
  4 files changed, 77 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e368fbc5..585ebc37 100644
+index 46d802a2f..d91c54fa9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1081,6 +1081,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -22,7 +22,7 @@ index e368fbc5..585ebc37 100644
      public void a(SoundEffect soundeffect, float f, float f1) {
          if (!this.isSilent()) {
              this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), soundeffect, this.getSoundCategory(), f, f1);
-@@ -2626,6 +2627,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2627,6 +2628,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.invulnerable = flag;
      }
 
@@ -31,7 +31,7 @@ index e368fbc5..585ebc37 100644
          this.setPositionRotation(entity.locX(), entity.locY(), entity.locZ(), entity.yaw, entity.pitch);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index 723a9fa1..f56fd7c0 100644
+index 723a9fa1e..f56fd7c01 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -34,6 +34,7 @@ public class EntityCow extends EntityAnimal {
@@ -124,7 +124,7 @@ index 723a9fa1..f56fd7c0 100644
      public EntityCow createChild(EntityAgeable entityageable) {
          return (EntityCow) EntityTypes.COW.a(this.world);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 53925d52..01c0919f 100644
+index 53925d526..01c0919f6 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2818,8 +2818,9 @@ public abstract class EntityLiving extends Entity {
@@ -140,7 +140,7 @@ index 53925d52..01c0919f 100644
      }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 12fbdf65..091f3072 100644
+index 12fbdf65c..091f30727 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -145,10 +145,12 @@ public class PurpurWorldConfig {

patches/server/0007-Ridables.patch

@@ -1,4 +1,4 @@
-From 6e163b10eb444f0fc0573636727586bf44298e98 Mon Sep 17 00:00:00 2001
+From 7eb5dc2697e63f21e355f411c5299e8427608824 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:26:06 -0500
 Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
@@ -13,7 +13,7 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
  6 files changed, 226 insertions(+), 11 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/DamageSource.java b/src/main/java/net/minecraft/server/DamageSource.java
-index f7344d3a..f6c0165f 100644
+index f7344d3ae..f6c0165f9 100644
 --- a/src/main/java/net/minecraft/server/DamageSource.java
 +++ b/src/main/java/net/minecraft/server/DamageSource.java
 @@ -82,6 +82,7 @@ public class DamageSource {
@@ -25,7 +25,7 @@ index f7344d3a..f6c0165f 100644
          return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic();
      }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 585ebc37..217ab1be 100644
+index d91c54fa9..0d5e942a0 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1427,6 +1427,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -55,7 +55,7 @@ index 585ebc37..217ab1be 100644
              return null;
          } else if (this.world.isClientSide) {
 diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
-index a57d0089..02952c3a 100644
+index a57d0089d..02952c3af 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
 @@ -13,6 +13,12 @@ public class EntityEnderCrystal extends Entity {
@@ -123,7 +123,7 @@ index a57d0089..02952c3a 100644
      @Override
      protected void b(NBTTagCompound nbttagcompound) {
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index 9d331f9a..77b69cd3 100644
+index 777bc95ee..265077048 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -8,9 +8,10 @@ import javax.annotation.Nullable;
@@ -350,7 +350,7 @@ index 9d331f9a..77b69cd3 100644
 
              return entityliving != null ? EntityPhantom.this.a(EntityPhantom.this.getGoalTarget(), PathfinderTargetCondition.a) : false;
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index 5135308f..89961900 100644
+index 5135308fb..899619009 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
 @@ -34,6 +34,7 @@ public interface IEntityAccess {
@@ -362,23 +362,23 @@ index 5135308f..89961900 100644
          return this.a(oclass, axisalignedbb, IEntitySelector.f);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 12cd8196..e341c492 100644
+index 85692500b..c9b41cebd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -404,6 +404,9 @@ public class PurpurWorldConfig {
+@@ -402,6 +402,9 @@ public class PurpurWorldConfig {
+     public double phantomMaxY = 256D;
+     public float phantomFlameDamage = 1.0F;
      public int phantomFlameFireTime = 8;
-     public boolean phantomIgnoreCreative = false;
-     public boolean phantomOnlyAttackInsomniacs = false;
 +    public double phantomAttackedByCrystalRadius = 0.0D;
 +    public float phantomAttackedByCrystalDamage = 1.0F;
 +    public double phantomOrbitCrystalRadius = 0.0D;
      private void phantomSettings() {
          phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
          phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
-@@ -413,6 +416,9 @@ public class PurpurWorldConfig {
+@@ -409,6 +412,9 @@ public class PurpurWorldConfig {
+         phantomMaxY = getDouble("mobs.phantom.ridable-max-y", phantomMaxY);
+         phantomFlameDamage = (float) getDouble("mobs.phantom.flames.damage", phantomFlameDamage);
          phantomFlameFireTime = getInt("mobs.phantom.flames.fire-time", phantomFlameFireTime);
-         phantomIgnoreCreative = getBoolean("mobs.phantom.do-not-spawn-on-creative-players", phantomIgnoreCreative);
-         phantomOnlyAttackInsomniacs = getBoolean("mobs.phantom.only-attack-insomniacs", phantomOnlyAttackInsomniacs);
 +        phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
 +        phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
 +        phantomOrbitCrystalRadius = getDouble("mobs.phantom.orbit-crystal-radius", phantomOrbitCrystalRadius);

patches/server/0019-Cows-eat-mushrooms.patch

@@ -1,4 +1,4 @@
-From 05b163485832610a992b81a1a7589887ac6eebbe Mon Sep 17 00:00:00 2001
+From d661297b2f62eea8c5b474b4ded7973ec8e026fd Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 3 May 2019 23:58:44 -0500
 Subject: [PATCH] Snowman drop and put back pumpkin
@@ -9,7 +9,7 @@ Subject: [PATCH] Snowman drop and put back pumpkin
  2 files changed, 21 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
-index 941873513f..efc2205f7c 100644
+index 941873513..efc2205f7 100644
 --- a/src/main/java/net/minecraft/server/EntitySnowman.java
 +++ b/src/main/java/net/minecraft/server/EntitySnowman.java
 @@ -8,6 +8,7 @@ import org.bukkit.event.player.PlayerShearEntityEvent;
@@ -47,10 +47,10 @@ index 941873513f..efc2205f7c 100644
              return tryRide(entityhuman, enumhand); // Purpur
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e341c492ed..0223c5de9a 100644
+index c9b41cebd..56b67c408 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -544,11 +544,15 @@ public class PurpurWorldConfig {
+@@ -540,11 +540,15 @@ public class PurpurWorldConfig {
      public boolean snowGolemRidableInWater = false;
      public boolean snowGolemRequireShiftToMount = true;
      public boolean snowGolemLeaveTrailWhenRidden = false;

…-to-crystals-and-crystals-shoot-ph.patch …-to-crystals-and-crystals-shoot-ph.patchpatches/server/0024-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch renamed to patches/server/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch patches/server/0024-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch renamed to patches/server/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch

@@ -1,4 +1,4 @@
-From dd9bb64c5e39f499d8016f1804c5f58dedc5e1a9 Mon Sep 17 00:00:00 2001
+From 902c04b41327f7db8aa12a85bae347e1969e2cf9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 7 Feb 2020 04:42:57 -0600
 Subject: [PATCH] Ender dragon always drop egg
@@ -9,7 +9,7 @@ Subject: [PATCH] Ender dragon always drop egg
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index 687efa022d..ead3346072 100644
+index 687efa022..ead334607 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
 @@ -21,7 +21,7 @@ public class EnderDragonBattle {
@@ -39,7 +39,7 @@ index 687efa022d..ead3346072 100644
          return this.l;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 5744a65cce..abbbc0db59 100644
+index 56b67c408..cc6f8563b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -206,11 +206,13 @@ public class PurpurWorldConfig {

patches/server/0022-Phantoms-do-not-spawn-on-creative-players.patch

@@ -1,4 +1,4 @@
-From 5a776e9ce515dbe009d4062eb92937946b9e8568 Mon Sep 17 00:00:00 2001
+From ec4c2b7e0bc52fbd36bbe6a011a5dbd0c6149d51 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 24 Aug 2019 14:42:54 -0500
 Subject: [PATCH] Ender dragon always drop full exp
@@ -9,7 +9,7 @@ Subject: [PATCH] Ender dragon always drop full exp
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index e08b731d2c..baab056eff 100644
+index a6a79f5e9..336cf7da2 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -641,7 +641,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -22,7 +22,7 @@ index e08b731d2c..baab056eff 100644
          }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index abbbc0db59..bc2f7c0846 100644
+index cc6f8563b..426e6f18b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -207,12 +207,14 @@ public class PurpurWorldConfig {