Skip to content

Commit acf4f28

Browse files
committed
Capture empty lines
1 parent 1019f04 commit acf4f28

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

log-utils/src/main/java/net/minecraftforge/util/logging/DelegatePrintStream.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public Capturing(AbstractLogger logger, Logger.Level level, Consumer<? super Str
2020
super(new OutputStream() {
2121
private final Consumer<? super String> consumer = new LogConsumer(level, output);
2222
private StringBuffer buffer = new StringBuffer(512);
23+
private char last = 0;
2324

2425
@Override
2526
public void write(int b) {
@@ -28,13 +29,15 @@ public void write(int b) {
2829

2930
private void write(char c) {
3031
if (c == '\n' || c == '\r') {
31-
if (this.buffer.length() != 0) {
32+
// Prevent \r\n (windows) from making two lines
33+
if (last != '\r') {
3234
consumer.accept(this.buffer.insert(0, logger.getIndentationImpl() + logger.tag).toString());
3335
this.buffer = new StringBuffer(512);
3436
}
3537
} else {
3638
this.buffer.append(c);
3739
}
40+
this.last = c;
3841
}
3942
});
4043

0 commit comments

Comments
 (0)