Fix #365 by blocking all hacked Minecraft logs text as XML

This commit is contained in:
huangyuhui 2018-07-11 20:11:09 +08:00
parent 7dad8d452f
commit dfd5a82112
2 changed files with 5 additions and 1 deletions

View File

@ -323,7 +323,8 @@ public class DefaultLauncher extends Launcher {
} }
private void startMonitors(ManagedProcess managedProcess, ProcessListener processListener, boolean isDaemon) { private void startMonitors(ManagedProcess managedProcess, ProcessListener processListener, boolean isDaemon) {
boolean enablesLoggingInfo = version.getLogging() != null && version.getLogging().containsKey(DownloadType.CLIENT); boolean enablesLoggingInfo = version.getLogging() != null && version.getLogging().containsKey(DownloadType.CLIENT)
&& !"net.minecraft.launchwrapper.Launch".equals(version.getMainClass());
if (enablesLoggingInfo) if (enablesLoggingInfo)
startMonitorsWithLoggingInfo(managedProcess, processListener, isDaemon); startMonitorsWithLoggingInfo(managedProcess, processListener, isDaemon);
else else

View File

@ -118,6 +118,9 @@ final class Log4jHandler extends Thread {
Logging.LOG.log(Level.WARNING, "An error occurred when writing console lines", e); Logging.LOG.log(Level.WARNING, "An error occurred when writing console lines", e);
logs.forEach(System.out::println); logs.forEach(System.out::println);
broken = true; broken = true;
} else {
// Output plain XML to user
callback.accept(log, Log4jLevel.INFO);
} }
} }
}); });