From 95e4d28a35bfe3b48946a54ecdc5c11ce6a5e566 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 25 May 2014 14:40:33 +1000
Subject: [PATCH] Replace typing yes into the console with a 10 second wait -
 most have updated or are aware of the changes by now

---
 CraftBukkit-Patches/0121-Update-Warning.patch | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/CraftBukkit-Patches/0121-Update-Warning.patch b/CraftBukkit-Patches/0121-Update-Warning.patch
index d9401756c2..ab5b1bfc17 100644
--- a/CraftBukkit-Patches/0121-Update-Warning.patch
+++ b/CraftBukkit-Patches/0121-Update-Warning.patch
@@ -1,14 +1,14 @@
-From ce79becf80b388d9b56cbf5a9f16a37c27d46a83 Mon Sep 17 00:00:00 2001
+From e64ddd03c83d1d9ed8e9609990095c6290f1213f Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 21:37:12 +1000
 Subject: [PATCH] Update Warning
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 008e037..9bbc782 100644
+index 008e037..1977722 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -1,7 +1,9 @@
+@@ -1,10 +1,13 @@
  package org.bukkit.craftbukkit;
  
 +import java.io.BufferedReader;
@@ -18,7 +18,11 @@ index 008e037..9bbc782 100644
  import java.text.SimpleDateFormat;
  import java.util.Arrays;
  import java.util.List;
-@@ -15,7 +17,32 @@ public class Main {
++import java.util.concurrent.TimeUnit;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+ import joptsimple.OptionParser;
+@@ -15,7 +18,28 @@ public class Main {
      public static boolean useJline = true;
      public static boolean useConsole = true;
  
@@ -28,24 +32,20 @@ index 008e037..9bbc782 100644
 +        File lock = new File( ".update-lock" );
 +        if ( !new File( "update-lock" ).exists() && !lock.exists()  && System.getProperty( "IReallyKnowWhatIAmDoingThisUpdate" ) == null )
 +        {
-+            BufferedReader br = new BufferedReader( new InputStreamReader( System.in ) );
-+            String line;
 +            System.err.println( "WARNING: This Minecraft update alters the way in which saved data is stored." );
 +            System.err.println( "Please ensure your server is in the correct online/offline mode state, as the changes made are PERMANENT" );
 +            System.err.println( "If you are running in offline mode, but your BungeeCord is in online mode, it is imperative that BungeeCord support is enabled in spigot.yml and BungeeCord's config.yml" );
 +            System.err.println( "By typing `yes` you acknowledge that you have taken the necessary backups and are aware of this conversion" );
 +            System.err.println( "Please type yes to continue starting the server. You have been warned :)" );
 +            System.err.println( "See http://www.spigotmc.org/wiki/uuid-conversion/ if you have any questions and remember BACKUP BACKUP BACKUP" );
-+            while ( ( line = br.readLine() ) != null )
++            System.err.println( "=================================================================================" );
++            System.err.println( "Starting server in 10 seconds" );
++            lock.createNewFile();
++            try
++            {
++                Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
++            } catch ( InterruptedException ex )
 +            {
-+                if ( "yes".equals( line ) )
-+                {
-+                    lock.createNewFile();
-+                    break;
-+                } else
-+                {
-+                    System.err.println( "Please type `yes` (without the quotes) to continue" );
-+                }
 +            }
 +        }
 +        // Spigot End