From 06818d2dd7d410ed1240d5653f51fcc44a191070 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 5 Jan 2018 00:46:00 -0600 Subject: [PATCH] Update upstream CB/S --- ...Be-a-bit-more-informative-in-maxHealth-exception.patch | 8 ++++---- ...methods-for-working-with-arrows-stuck-in-living-.patch | 8 ++++---- work/CraftBukkit | 2 +- work/Spigot | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Spigot-Server-Patches/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch index 2ff13906c1..b236877cb7 100644 --- a/Spigot-Server-Patches/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch +++ b/Spigot-Server-Patches/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch @@ -1,14 +1,14 @@ -From f5d86c4e83afdc7def0962b105d37cb4e881a0c2 Mon Sep 17 00:00:00 2001 +From 2ab6db5456790e25138316daebc61e8bb9a79067 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 3 Mar 2016 02:18:39 -0600 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 -@@ -98,7 +98,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -94,7 +94,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public void setHealth(double health) { health = (float) health; if ((health < 0) || (health > getMaxHealth())) { @@ -21,5 +21,5 @@ index e2083fb29..f641c6dc1 100644 getHandle().setHealth((float) health); -- -2.13.3.windows.1 +2.15.1.windows.2 diff --git a/Spigot-Server-Patches/0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch index ce799be4f2..527bb39ca8 100644 --- a/Spigot-Server-Patches/0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-Server-Patches/0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,14 +1,14 @@ -From c9b607383318c5e3af4b0afb7d77ecf2f32a93c8 Mon Sep 17 00:00:00 2001 +From 110010cf39dad71b885d93f3b3f056d0b58687a0 Mon Sep 17 00:00:00 2001 From: mrapple Date: Sun, 25 Nov 2012 13:43:39 -0600 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 -@@ -538,4 +538,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -494,4 +494,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public boolean isCollidable() { return getHandle().collides; } @@ -26,5 +26,5 @@ index f641c6dc1..1eafdecb4 100644 + // Paper end } -- -2.13.3.windows.1 +2.15.1.windows.2 diff --git a/work/CraftBukkit b/work/CraftBukkit index dc7d31b00d..ab09b27ef4 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit dc7d31b00d121c486660fafc9d6b4eb38e9db76d +Subproject commit ab09b27ef4e725ce47c64390166987aefe58fa72 diff --git a/work/Spigot b/work/Spigot index 325fbc7f16..109b080674 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 325fbc7f164aeab1f169e47374a9bdd0d67cc8ba +Subproject commit 109b080674813aa448e58f1f0106f121ec500614