Allow non hidden update lock

This commit is contained in:
md_5 2014-04-15 19:28:39 +10:00
parent 9360048150
commit 05a8645290

View file

@ -1,11 +1,11 @@
From 4bf69ab03aa8a2ccd26342e71dbf9d81df55fd4f Mon Sep 17 00:00:00 2001 From 2c1908bc333875cfb968785dd5ac8d620bbb0ebd 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..1bc6d4a 100644 index 008e037..9bbc782 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,7 +1,9 @@
@ -26,7 +26,7 @@ index 008e037..1bc6d4a 100644
+ public static void main(String[] args) throws IOException { + public static void main(String[] args) throws IOException {
+ // Spigot Start + // Spigot Start
+ File lock = new File( ".update-lock" ); + File lock = new File( ".update-lock" );
+ if ( !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 ) ); + BufferedReader br = new BufferedReader( new InputStreamReader( System.in ) );
+ String line; + String line;