From 8878ecc5f382092f4e888096427c70da20a9a21f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 1 Feb 2017 22:48:16 -0600 Subject: [PATCH] Update upstream CB Closes GH-596 --- ...5-Be-a-bit-more-informative-in-maxHealth-exception.patch | 6 +++--- ...d-methods-for-working-with-arrows-stuck-in-living-.patch | 6 +++--- .../0080-Set-health-before-death-event.patch | 6 +++--- ...194-Change-Outdated-Build-Download-URL-to-Paper-CI.patch | 6 +++--- work/CraftBukkit | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Spigot-Server-Patches/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch index 3071f8dd2d..ad871e36b7 100644 --- a/Spigot-Server-Patches/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch +++ b/Spigot-Server-Patches/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch @@ -1,14 +1,14 @@ -From 1296736b591fdc5caadef00bfb17a026fb9d56e5 Mon Sep 17 00:00:00 2001 +From 8df594dafa3d1db0eb68bdffcaa763b9e0c51072 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 58fbed1d3..c1af8ddbd 100644 +index c00260f67..5520c707e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -93,7 +93,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -96,7 +96,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public void setHealth(double health) { health = (float) health; if ((health < 0) || (health > getMaxHealth())) { diff --git a/Spigot-Server-Patches/0065-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0065-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 89e63db360..1f0a17b577 100644 --- a/Spigot-Server-Patches/0065-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-Server-Patches/0065-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,4 +1,4 @@ -From 0682a1c8a0a5f078c6d72d7035fe17a64e6316e2 Mon Sep 17 00:00:00 2001 +From 73d194d5f867e136da9d1f67208185c63001a13d 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 @@ -22,10 +22,10 @@ index a2d476818..193dadf43 100644 this.datawatcher.set(EntityLiving.bq, Integer.valueOf(i)); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index c1af8ddbd..392e72bb5 100644 +index 5520c707e..eeb4f5b32 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -560,4 +560,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -566,4 +566,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public boolean isCollidable() { return getHandle().collides; } diff --git a/Spigot-Server-Patches/0080-Set-health-before-death-event.patch b/Spigot-Server-Patches/0080-Set-health-before-death-event.patch index 66f02f8571..896de9351a 100644 --- a/Spigot-Server-Patches/0080-Set-health-before-death-event.patch +++ b/Spigot-Server-Patches/0080-Set-health-before-death-event.patch @@ -1,4 +1,4 @@ -From aaca06a70159e5a8b8be8f71820311e886f10951 Mon Sep 17 00:00:00 2001 +From 32280fdab148d7273e5b8c88550d52ef382940a6 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 19 Jul 2015 16:51:38 -0400 Subject: [PATCH] Set health before death event @@ -19,10 +19,10 @@ index 7da844e43..4103d4966 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 392e72bb5..a7ca9a508 100644 +index eeb4f5b32..b7e832f31 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -99,11 +99,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -102,11 +102,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { + (this instanceof CraftPlayer ? ", player: " + this.getName() + ')' : ')')); } diff --git a/Spigot-Server-Patches/0194-Change-Outdated-Build-Download-URL-to-Paper-CI.patch b/Spigot-Server-Patches/0194-Change-Outdated-Build-Download-URL-to-Paper-CI.patch index 502367a70b..fbb23bc1ae 100644 --- a/Spigot-Server-Patches/0194-Change-Outdated-Build-Download-URL-to-Paper-CI.patch +++ b/Spigot-Server-Patches/0194-Change-Outdated-Build-Download-URL-to-Paper-CI.patch @@ -1,15 +1,15 @@ -From 625eec111773732cf5214eefbed6db8c145687eb Mon Sep 17 00:00:00 2001 +From 118950ef18b4a7c075dfeaa7c1a46b33b35564a3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 29 Dec 2016 00:56:51 -0500 Subject: [PATCH] Change Outdated Build Download URL to Paper CI diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 4ac4e6fd3..3164e7130 100644 +index 59d4e2e6f..e4ec213e4 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -200,7 +200,7 @@ public class Main { - deadline.add(Calendar.DAY_OF_YEAR, -10); + deadline.add(Calendar.DAY_OF_YEAR, -14); if (buildDate.before(deadline.getTime())) { System.err.println("*** Error, this build is outdated ***"); - System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/ ***"); diff --git a/work/CraftBukkit b/work/CraftBukkit index c1aa85918e..a1d3777d89 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit c1aa85918e6683fa0d8677feb733ba8743c40502 +Subproject commit a1d3777d890b6a9ae20b9450c2af9b373e4d3575