core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace typing yes into the console with a 10 second wait - most have updated or are aware of the changes by now

This commit is contained in:
md_5 2014-05-25 14:40:33 +10:00
parent 551c6c2dd9
commit 95e4d28a35
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
CraftBukkit-Patches/0121-Update-Warning.patch
View File

@ -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> From: md_5 <git@md-5.net>
Date: Sat, 12 Apr 2014 21:37:12 +1000 Date: Sat, 12 Apr 2014 21:37:12 +1000
Subject: [PATCH] Update Warning Subject: [PATCH] Update Warning
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java 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 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/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; package org.bukkit.craftbukkit;
+import java.io.BufferedReader; +import java.io.BufferedReader;
@ -18,7 +18,11 @@ index 008e037..9bbc782 100644
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; 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 useJline = true;
public static boolean useConsole = true; public static boolean useConsole = true;
@ -28,24 +32,20 @@ index 008e037..9bbc782 100644
+ File lock = new File( ".update-lock" ); + File lock = new File( ".update-lock" );
+ if ( !new File( "update-lock" ).exists() && !lock.exists() && System.getProperty( "IReallyKnowWhatIAmDoingThisUpdate" ) == null ) + 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( "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( "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( "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( "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( "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" ); + 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" );
+ if ( "yes".equals( line ) )
+ {
+ lock.createNewFile(); + lock.createNewFile();
+ break; + try
+ } else + {
+ Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
+ } catch ( InterruptedException ex )
+ { + {
+ System.err.println( "Please type `yes` (without the quotes) to continue" );
+ }
+ } + }
+ } + }
+ // Spigot End + // Spigot End