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 b7a075d250..95118e7099 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 @@ -22,7 +22,7 @@ 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 @@ -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 9c34604c80..53bcab5c92 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 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 @@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/Change-Outdated-Build-Download-URL-to-Paper-CI.patch b/Spigot-Server-Patches/Change-Outdated-Build-Download-URL-to-Paper-CI.patch index 65215c67d8..b3eaf8525e 100644 --- a/Spigot-Server-Patches/Change-Outdated-Build-Download-URL-to-Paper-CI.patch +++ b/Spigot-Server-Patches/Change-Outdated-Build-Download-URL-to-Paper-CI.patch @@ -5,11 +5,11 @@ 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 @@ -0,0 +0,0 @@ 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/Spigot-Server-Patches/Set-health-before-death-event.patch b/Spigot-Server-Patches/Set-health-before-death-event.patch index c9c81b719a..2b529e0801 100644 --- a/Spigot-Server-Patches/Set-health-before-death-event.patch +++ b/Spigot-Server-Patches/Set-health-before-death-event.patch @@ -19,7 +19,7 @@ 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 @@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { 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