summaryrefslogtreecommitdiffstats
path: root/nms-patches/DedicatedServer.patch
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2015-05-22 14:33:34 +0100
committerThinkofdeath <thinkofdeath@spigotmc.org>2015-05-22 14:34:10 +0100
commit529e4cd74ab7b44b52bfcd3fad2b84ebbf1a2a81 (patch)
treed1a92b6ba5d932a00a8c0287566d1f3489f4a489 /nms-patches/DedicatedServer.patch
parentf87cd1a53d86d1c9f961c3a4664f98510182a3b7 (diff)
downloadcraftbukkit-529e4cd74ab7b44b52bfcd3fad2b84ebbf1a2a81.tar
craftbukkit-529e4cd74ab7b44b52bfcd3fad2b84ebbf1a2a81.tar.gz
craftbukkit-529e4cd74ab7b44b52bfcd3fad2b84ebbf1a2a81.tar.lz
craftbukkit-529e4cd74ab7b44b52bfcd3fad2b84ebbf1a2a81.tar.xz
craftbukkit-529e4cd74ab7b44b52bfcd3fad2b84ebbf1a2a81.zip
Update to 1.8.5
Diffstat (limited to 'nms-patches/DedicatedServer.patch')
-rw-r--r--nms-patches/DedicatedServer.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/DedicatedServer.patch b/nms-patches/DedicatedServer.patch
index 7edf9e18..9d9d4d61 100644
--- a/nms-patches/DedicatedServer.patch
+++ b/nms-patches/DedicatedServer.patch
@@ -1,5 +1,5 @@
---- /home/matt/mc-dev-private//net/minecraft/server/DedicatedServer.java 2015-05-05 21:41:20.360643410 +0100
-+++ src/main/java/net/minecraft/server/DedicatedServer.java 2015-05-05 21:41:20.364643350 +0100
+--- /home/matt/mc-dev-private//net/minecraft/server/DedicatedServer.java 2015-05-22 14:12:44.115229253 +0100
++++ src/main/java/net/minecraft/server/DedicatedServer.java 2015-05-22 14:12:44.119229189 +0100
@@ -15,20 +15,32 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -94,7 +94,7 @@
+ System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
+ // CraftBukkit end
+
- DedicatedServer.LOGGER.info("Starting minecraft server version 1.8.4");
+ DedicatedServer.LOGGER.info("Starting minecraft server version 1.8.5");
if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {
DedicatedServer.LOGGER.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
}