From 03ce426ddf0f6d220f1346a3a6f3dee9e10d1c00 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Fri, 5 Jan 2018 00:46:00 -0600
Subject: [PATCH] Update upstream CB/S

---
 .../Add-methods-for-working-with-arrows-stuck-in-living-.patch  | 2 +-
 .../Be-a-bit-more-informative-in-maxHealth-exception.patch      | 2 +-
 work/CraftBukkit                                                | 2 +-
 work/Spigot                                                     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Spigot-Server-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
index e26b1773b..0260f1084 100644
--- a/Spigot-Server-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index f641c6dc1..1eafdecb4 100644
+index 7bf45f7d0..b9e106031 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/Be-a-bit-more-informative-in-maxHealth-exception.patch
index 6c7442b98..7a953003b 100644
--- a/Spigot-Server-Patches/Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/Spigot-Server-Patches/Be-a-bit-more-informative-in-maxHealth-exception.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index e2083fb29..f641c6dc1 100644
+index 425919cda..7bf45f7d0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/work/CraftBukkit b/work/CraftBukkit
index dc7d31b00..ab09b27ef 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit dc7d31b00d121c486660fafc9d6b4eb38e9db76d
+Subproject commit ab09b27ef4e725ce47c64390166987aefe58fa72
diff --git a/work/Spigot b/work/Spigot
index 325fbc7f1..109b08067 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 325fbc7f164aeab1f169e47374a9bdd0d67cc8ba
+Subproject commit 109b080674813aa448e58f1f0106f121ec500614