[Auto] Updated Upstream (CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
79ada74 SPIGOT-4382: Fix damage_absorbed statistic

Spigot-Server-Patches/0073-Custom-replacement-for-eaten-items.patch

@@ -1,14 +1,14 @@
-From 74df9791b9e08039c1dd88ae4f8557114b1de854 Mon Sep 17 00:00:00 2001
+From 4182ffd42847bd0fdcfdedbdee5371e3b9a0b919 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:07:20 -0400
 Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ed6f5e70f3..442981f938 100644
+index 91baaa506..c3936c4e3 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2599,12 +2599,13 @@ public abstract class EntityLiving extends Entity {
+@@ -2602,12 +2602,13 @@ public abstract class EntityLiving extends Entity {
 
      protected void q() {
          if (!this.activeItem.isEmpty() && this.isHandRaised()) {
@@ -23,7 +23,7 @@ index ed6f5e70f3..442981f938 100644
                  world.getServer().getPluginManager().callEvent(event);
 
                  if (event.isCancelled()) {
-@@ -2619,9 +2620,20 @@ public abstract class EntityLiving extends Entity {
+@@ -2622,9 +2623,20 @@ public abstract class EntityLiving extends Entity {
                  itemstack = this.activeItem.a(this.world, this);
              }
 
@@ -45,5 +45,5 @@ index ed6f5e70f3..442981f938 100644
 
      }
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch

@@ -1,11 +1,11 @@
-From f328c4bf3c1f82b1e19a8f20201e5b938efb04c3 Mon Sep 17 00:00:00 2001
+From ea2c2b6a9ec6632dc008eb223f2d825e77205144 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e4b64b2d26..f482011175 100644
+index c3936c4e3..d41a7fb08 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -499,7 +499,13 @@ public abstract class EntityLiving extends Entity {
@@ -34,7 +34,7 @@ index e4b64b2d26..f482011175 100644
          // CraftBukkit start - Handle scaled health
          if (this instanceof EntityPlayer) {
              org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity();
-@@ -2464,7 +2474,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2467,7 +2477,7 @@ public abstract class EntityLiving extends Entity {
      }
 
      public void setAbsorptionHearts(float f) {
@@ -44,7 +44,7 @@ index e4b64b2d26..f482011175 100644
          }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cd32239132..fed28ecd91 100644
+index cd3223913..fed28ecd9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1563,6 +1563,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -56,5 +56,5 @@ index cd32239132..fed28ecd91 100644
      }
 
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0172-Cap-Entity-Collisions.patch

@@ -1,4 +1,4 @@
-From c30c57ac7ae9a69386053140d86c0d03d78059e7 Mon Sep 17 00:00:00 2001
+From 86e687c7ca2075a8210a77b978808f3e69ad5577 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 391cdd2fa5..8923454524 100644
+index 391cdd2fa..892345452 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -347,4 +347,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index 391cdd2fa5..8923454524 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a16fbd4579..cad4894000 100644
+index f3422a097..11dd946b4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,10 +39,10 @@ index a16fbd4579..cad4894000 100644
      // Spigot end
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1b8763f618..8c56eeb11c 100644
+index 398ad151a..d926cbb24 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2354,8 +2354,11 @@ public abstract class EntityLiving extends Entity {
+@@ -2357,8 +2357,11 @@ public abstract class EntityLiving extends Entity {
                  }
              }
 
@@ -56,5 +56,5 @@ index 1b8763f618..8c56eeb11c 100644
                  this.C(entity);
              }
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0216-Add-PlayerArmorChangeEvent.patch

@@ -1,11 +1,11 @@
-From ba92e8671f51c00dca93612905edd40b342da041 Mon Sep 17 00:00:00 2001
+From 9961d657e4eccc5d31266d52f8a8d3813ba45a19 Mon Sep 17 00:00:00 2001
 From: pkt77 <parkerkt77@gmail.com>
 Date: Fri, 10 Nov 2017 23:46:34 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 72a2164fdf..61af2621c5 100644
+index b9227f7a7..f5770884b 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1,5 +1,6 @@
@@ -15,7 +15,7 @@ index 72a2164fdf..61af2621c5 100644
  import com.google.common.base.Objects;
  import com.google.common.collect.Maps;
  import java.util.Collection;
-@@ -2083,6 +2084,13 @@ public abstract class EntityLiving extends Entity {
+@@ -2086,6 +2087,13 @@ public abstract class EntityLiving extends Entity {
                  ItemStack itemstack1 = this.getEquipment(enumitemslot);
 
                  if (!ItemStack.matches(itemstack1, itemstack)) {
@@ -30,7 +30,7 @@ index 72a2164fdf..61af2621c5 100644
                      if (!itemstack.isEmpty()) {
                          this.getAttributeMap().a(itemstack.a(enumitemslot));
 diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java
-index a90ac68c30..49592e5572 100644
+index a90ac68c3..49592e557 100644
 --- a/src/main/java/net/minecraft/server/EnumItemSlot.java
 +++ b/src/main/java/net/minecraft/server/EnumItemSlot.java
 @@ -20,6 +20,7 @@ public enum EnumItemSlot {
@@ -42,5 +42,5 @@ index a90ac68c30..49592e5572 100644
          return this.g;
      }
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0272-Make-shield-blocking-delay-configurable.patch

@@ -1,11 +1,11 @@
-From f12aed9eac0dc15fb9da809485a598f7d50c4083 Mon Sep 17 00:00:00 2001
+From c546b639b151d6b6137f0a838ee210b339fdd0de Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:18:16 -0500
 Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 16e601f7e9..2e3e48637a 100644
+index 16e601f7e..2e3e48637 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -412,4 +412,9 @@ public class PaperWorldConfig {
@@ -19,10 +19,10 @@ index 16e601f7e9..2e3e48637a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e2ceb7ae4b..ef1a1e5790 100644
+index f5770884b..566f6e3a6 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2700,7 +2700,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2703,7 +2703,7 @@ public abstract class EntityLiving extends Entity {
          if (this.isHandRaised() && !this.activeItem.isEmpty()) {
              Item item = this.activeItem.getItem();
 
@@ -31,7 +31,7 @@ index e2ceb7ae4b..ef1a1e5790 100644
          } else {
              return false;
          }
-@@ -2788,4 +2788,16 @@ public abstract class EntityLiving extends Entity {
+@@ -2791,4 +2791,16 @@ public abstract class EntityLiving extends Entity {
      public boolean df() {
          return true;
      }
@@ -49,7 +49,7 @@ index e2ceb7ae4b..ef1a1e5790 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 9acafadbbf..a09cd02403 100644
+index 9acafadbb..a09cd0240 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -533,5 +533,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -69,5 +69,5 @@ index 9acafadbbf..a09cd02403 100644
      // Paper end
  }
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0279-LivingEntity-Hand-Raised-Item-Use-API.patch

@@ -1,12 +1,12 @@
-From 1050d9af422c12ea913fe0312ed122fc0aafb85d Mon Sep 17 00:00:00 2001
+From d0f62979bd534c691c6c0f9f7f29763881499a01 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:21:28 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 9f0bc5a8e2..dd14f99dee 100644
+index a8f58a13f..c051200da 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -106,7 +106,7 @@ public abstract class EntityLiving extends Entity {
@@ -18,7 +18,7 @@ index 9f0bc5a8e2..dd14f99dee 100644
      protected int bu;
      protected int bv;
      private BlockPosition bL;
-@@ -2689,10 +2689,12 @@ public abstract class EntityLiving extends Entity {
+@@ -2692,10 +2692,12 @@ public abstract class EntityLiving extends Entity {
          return this.activeItem;
      }
 
@@ -32,7 +32,7 @@ index 9f0bc5a8e2..dd14f99dee 100644
          return this.isHandRaised() ? this.activeItem.k() - this.cX() : 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index a09cd02403..0860f2334d 100644
+index a09cd0240..0860f2334 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -543,5 +543,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -62,5 +62,5 @@ index a09cd02403..0860f2334d 100644
      // Paper end
  }
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0359-Add-ray-tracing-methods-to-LivingEntity.patch

@@ -1,14 +1,14 @@
-From 53c450f0d30d97e0ddee7a1dfd43912b7a310a72 Mon Sep 17 00:00:00 2001
+From cc884144a0d80b771854d1e74c12eb9e26c9e251 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 3 Sep 2018 18:20:03 -0500
 Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 904b67c26..890a3a02b 100644
+index c051200da..1328f8889 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2810,6 +2810,22 @@ public abstract class EntityLiving extends Entity {
+@@ -2813,6 +2813,22 @@ public abstract class EntityLiving extends Entity {
      }
 
      // Paper start
@@ -72,5 +72,5 @@ index 0860f2334..028495700 100644
          return getLineOfSight(transparent, maxDistance, 2);
      }
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0363-Improve-death-events.patch

@@ -1,4 +1,4 @@
-From 399e9456e54ee49d7bccb7ef65aa3dc3172237ae Mon Sep 17 00:00:00 2001
+From ce2c789269e4675bf3af76a5ec7933563eb0c4b3 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -69,7 +69,7 @@ index 35afffede..e8e741374 100644
      }
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 890a3a02b..4aea8e4c7 100644
+index 1328f8889..13dd55549 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -76,14 +76,14 @@ public abstract class EntityLiving extends Entity {
@@ -193,7 +193,7 @@ index 890a3a02b..4aea8e4c7 100644
      @Nullable
      protected SoundEffect cs() {
          return SoundEffects.ENTITY_GENERIC_DEATH;
-@@ -1706,10 +1734,12 @@ public abstract class EntityLiving extends Entity {
+@@ -1709,10 +1737,12 @@ public abstract class EntityLiving extends Entity {
 
      }