Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
ec9fa369 1.15.2 - Updated Upstream (Bukkit/CraftBukkit)

current-paper

@@ -1 +1 @@
-1.15.2--c9a7a8c3a5d1f9feafc43f246ab79fe31270202d
+1.15.2--845e26b4f356101f020f8c550d67f398aecfaabd

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

@@ -1,4 +1,4 @@
-From f9ab48da215fbf1f9cd45ee9daa0a5860dc2c9a5 Mon Sep 17 00:00:00 2001
+From e3b69abad347357a82d5891d9d16bd203d99891f 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
@@ -124,10 +124,10 @@ index 723a9fa1e..f56fd7c01 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 14dc1318a..bf82399c8 100644
+index a3db0e92d..685538793 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2838,8 +2838,9 @@ public abstract class EntityLiving extends Entity {
+@@ -2839,8 +2839,9 @@ public abstract class EntityLiving extends Entity {
          this.aK = f;
      }
  

patches/server/0034-Campfires-have-regen-effect.patch

@@ -1,4 +1,4 @@
-From 47201ce57f115901505987858cc16e919b551f0c Mon Sep 17 00:00:00 2001
+From 9b77d9886cde434034d95d1dd086971e27e85222 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 19 May 2019 18:11:53 -0500
 Subject: [PATCH] Campfires have regen effect
@@ -25,13 +25,13 @@ index 6303be944..65f8d803b 100644
      public static final BlockStateDirection e = BlockProperties.N;
      private static final VoxelShape f = Block.a(6.0D, 0.0D, 6.0D, 10.0D, 16.0D, 10.0D);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index bf82399c8..10af384d6 100644
+index 685538793..aaaa98318 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2798,10 +2798,19 @@ public abstract class EntityLiving extends Entity {
+@@ -2799,10 +2799,19 @@ public abstract class EntityLiving extends Entity {
-     }
  
      public boolean hasLineOfSight(Entity entity) {
+         if (this.world != entity.world) return false; // CraftBukkit - SPIGOT-5675, SPIGOT-5798, MC-149563
 -        Vec3D vec3d = new Vec3D(this.locX(), this.getHeadY(), this.locZ());
 -        Vec3D vec3d1 = new Vec3D(entity.locX(), entity.getHeadY(), entity.locZ());
 +        // Purpur start

patches/server/0053-Climbing-should-not-bypass-cramming-gamerule.patch

@@ -1,4 +1,4 @@
-From 8ae63e002d53063369985ba2da34b6a6723b13eb Mon Sep 17 00:00:00 2001
+From f725aa440b07c03d51e5931eecc2f2b2d740d2a1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:06:20 -0500
 Subject: [PATCH] Climbing should not bypass cramming gamerule
@@ -86,7 +86,7 @@ index f31cb0554..0ecdea671 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 677c2dc4f..288942e9d 100644
+index 94be35603..2d0ccff03 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2694,7 +2694,7 @@ public abstract class EntityLiving extends Entity {
@@ -98,7 +98,7 @@ index 677c2dc4f..288942e9d 100644
          try {
          // Tuinity end - reduce memory allocation from collideNearby
  
-@@ -2837,8 +2837,10 @@ public abstract class EntityLiving extends Entity {
+@@ -2838,8 +2838,10 @@ public abstract class EntityLiving extends Entity {
      }
  
      @Override