diff --git a/Patches/0181-Mineplex-Patches.patch b/Patches/0181-Mineplex-Patches.patch index e6b6c5342..c8af3d8c1 100644 --- a/Patches/0181-Mineplex-Patches.patch +++ b/Patches/0181-Mineplex-Patches.patch @@ -1,4 +1,4 @@ -From dab2987baf7b1908affbdda61b2019d4338d2d72 Mon Sep 17 00:00:00 2001 +From 52ffc1e292f4a6ead573bdfcd884c800b8c4b1a5 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Tue, 2 Sep 2014 21:54:15 -0700 Subject: [PATCH] Mineplex Patches @@ -1834,6 +1834,36 @@ index ea786ae..20ab405 100644 world.addEntity(entity, reason); return (T) entity.getBukkitEntity(); +diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java +index 0c4976d..28ab76a 100644 +--- a/src/main/java/org/bukkit/craftbukkit/Main.java ++++ b/src/main/java/org/bukkit/craftbukkit/Main.java +@@ -49,25 +49,6 @@ public class Main { + + "*** Any bug reports not running the very latest versions of these softwares will be ignored ***\n\n" ); + + Enumeration resources = Main.class.getClassLoader().getResources( "META-INF/MANIFEST.MF" ); +- while ( resources.hasMoreElements() ) +- { +- Manifest manifest = new Manifest( resources.nextElement().openStream() ); +- String ts = manifest.getMainAttributes().getValue( "Timestamp" ); +- if ( ts != null ) +- { +- Date buildDate = new SimpleDateFormat( "yyyyMMdd-hhmm" ).parse( ts ); +- +- Calendar cal = Calendar.getInstance(); +- cal.add( Calendar.DAY_OF_YEAR, -2 ); +- if ( buildDate.before(cal.getTime() ) ) +- { +- System.err.println( "WARNING: This build is more than 2 days old and there are likely updates available!" ); +- System.err.println( "You will get no support with this build unless you update from http://ci.md-5.net/job/Spigot/" ); +- System.err.println( "The server will start in 10 seconds!" ); +- Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) ); +- } +- } +- } + // Spigot End + // Todo: Installation script + OptionParser parser = new OptionParser() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 35f2bfa..8a6ca55 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/Plugins/Libraries/craftbukkit.jar b/Plugins/Libraries/craftbukkit.jar index b4439454b..f5492b351 100644 Binary files a/Plugins/Libraries/craftbukkit.jar and b/Plugins/Libraries/craftbukkit.jar differ