Update from upstream SpigotMC

66af3b310e0
a969bf6c85d
95d56229d8f
87c1d0c8b7c
baf01cc7f84
38b8866783d [M]
This commit is contained in:
Zach Brown
2014-12-02 00:02:15 -06:00
parent 9cb520d8f1
commit 2bb64147b6
4 changed files with 47 additions and 21 deletions

View File

@@ -4,18 +4,6 @@ Date: Tue, 8 Jul 2014 20:27:52 +1000
Subject: [PATCH] Fix Slow "Loading Libraries"
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 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 {
System.out.println( "Please see http://www.spigotmc.org/wiki/changing-permgen-size/ for more details and more in-depth instructions." );
}
// Spigot End
- System.out.println("Loading libraries, please wait...");
MinecraftServer.main(options);
} catch (Throwable t) {
t.printStackTrace();
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/resources/log4j2.xml
@@ -27,4 +15,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
<Appenders>
<Console name="WINDOWS_COMPAT" target="SYSTEM_OUT"></Console>
<Queue name="TerminalConsole">
--
--
1.9.4.msysgit.2