Commits
md_5 authored a6a57a96d02
| 88 88 | + } |
| 89 89 | + |
| 90 90 | + new Thread(new org.bukkit.craftbukkit.util.TerminalConsoleWriterThread(System.out, this.reader)).start(); |
| 91 91 | + |
| 92 92 | + System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true)); |
| 93 93 | + System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true)); |
| 94 94 | + // CraftBukkit end |
| 95 95 | + |
| 96 96 | thread.setDaemon(true); |
| 97 97 | thread.start(); |
| 98 - | DedicatedServer.LOGGER.info("Starting minecraft server version 1.8.6"); |
| 98 + | DedicatedServer.LOGGER.info("Starting minecraft server version 1.8.7"); |
| 99 99 | |
| 100 100 | } |
| 101 101 | |
| 102 102 | DedicatedServer.LOGGER.info("Loading properties"); |
| 103 103 | - this.propertyManager = new PropertyManager(new File("server.properties")); |
| 104 104 | + this.propertyManager = new PropertyManager(this.options); // CraftBukkit - CLI argument support |
| 105 105 | this.p = new EULA(new File("eula.txt")); |
| 106 106 | if (!this.p.a()) { |
| 107 107 | DedicatedServer.LOGGER.info("You need to agree to the EULA in order to run the server. Go to eula.txt for more info."); |
| 108 108 | |