From 7b4fe3ed73d6a4e0e834534b3ea2d1597b692870 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sat, 17 Jun 2017 14:18:29 -0500
Subject: [PATCH] Update upstream CB

---
 ...-Paper-in-client-crashes-server-lists-and-Mojang.patch | 8 ++++----
 work/CraftBukkit                                          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Spigot-Server-Patches/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index b6be1847ca..1eaf736d6b 100644
--- a/Spigot-Server-Patches/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/Spigot-Server-Patches/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -20,7 +20,7 @@ index 8361888c2..3623751bf 100644
              EULA.a.warn("Failed to save {}", this.b, exception);
          } finally {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3629cbc47..476d1a23e 100644
+index 43b4e552b..024218a1d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -46,15 +46,15 @@ index 5c05ae407..bfc42b12f 100644
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 30b6f3477..22cb680df 100644
+index 174763f23..35123d58b 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 {
                      Date buildDate = new SimpleDateFormat("yyyyMMdd-HHmm").parse(Main.class.getPackage().getImplementationVendor());
  
                      Calendar deadline = Calendar.getInstance();
--                    deadline.add(Calendar.DAY_OF_YEAR, -3);
-+                    deadline.add(Calendar.DAY_OF_YEAR, -14); // Paper - Bump back to 14, this is pre-release anyway
+-                    deadline.add(Calendar.DAY_OF_YEAR, -7);
++                    deadline.add(Calendar.DAY_OF_YEAR, -14); // Paper - Bump back to 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 f7d14f184d..6aa0fa3206 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit f7d14f184d386cb5b0dd604dd1fdcd683fe9e065
+Subproject commit 6aa0fa32069330765546643a199dfd3a3c77284c