Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-26 12:08:17 +00:00
Code Issues Projects Releases Wiki Activity

Hardcode EventType.GAME for ServerLogEvent

Browse Source
This commit is contained in:
KingRainbow44 2022-06-24 01:22:11 -04:00
parent 52da2c235d
commit 95df9a3162
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/emu/grasscutter/server/event/internal/ServerLogEvent.java
View File

@ -1,22 +1,24 @@
package emu.grasscutter.server.event.internal; package emu.grasscutter.server.event.internal;
import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.AppenderBase;
import emu.grasscutter.server.event.types.ServerEvent; import emu.grasscutter.server.event.types.ServerEvent;
public class ServerLogEvent extends ServerEvent { public final class ServerLogEvent extends ServerEvent {
ILoggingEvent loggingEvent; private final ILoggingEvent loggingEvent;
String consoleMessage; private final String consoleMessage;
public ServerLogEvent(ILoggingEvent loggingEvent, String consoleMessage) {
super(Type.GAME);
public ServerLogEvent(Type type, ILoggingEvent loggingEvent, String consoleMessage) {
super(type);
this.loggingEvent = loggingEvent; this.loggingEvent = loggingEvent;
this.consoleMessage = consoleMessage; this.consoleMessage = consoleMessage;
} }
public ILoggingEvent getLoggingEvent() { return loggingEvent; } public ILoggingEvent getLoggingEvent() {
return this.loggingEvent;
}
public String getConsoleMessage() { public String getConsoleMessage() {
return consoleMessage; return this.consoleMessage;
} }
} }

4
src/main/java/emu/grasscutter/utils/ServerLogEventAppender.java
View File

@ -17,12 +17,12 @@ public class ServerLogEventAppender<E> extends AppenderBase<E> {
@Override @Override
protected void append(E event) { protected void append(E event) {
byte[] byteArray = this.encoder.encode(event); byte[] byteArray = this.encoder.encode(event);
ServerLogEvent sle = new ServerLogEvent(ServerEvent.Type.GAME, (ILoggingEvent) event, new String(byteArray, StandardCharsets.UTF_8)); ServerLogEvent sle = new ServerLogEvent((ILoggingEvent) event, new String(byteArray, StandardCharsets.UTF_8));
sle.call(); sle.call();
} }
public Encoder<E> getEncoder() { public Encoder<E> getEncoder() {
return encoder; return this.encoder;
} }
public void setEncoder(Encoder<E> encoder) { public void setEncoder(Encoder<E> encoder) {