From 95df9a3162337e457ab766bde3e10183d8c03a58 Mon Sep 17 00:00:00 2001 From: KingRainbow44 Date: Fri, 24 Jun 2022 01:22:11 -0400 Subject: [PATCH] Hardcode `EventType.GAME` for `ServerLogEvent` --- .../server/event/internal/ServerLogEvent.java | 18 ++++++++++-------- .../utils/ServerLogEventAppender.java | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/emu/grasscutter/server/event/internal/ServerLogEvent.java b/src/main/java/emu/grasscutter/server/event/internal/ServerLogEvent.java index 5903d4021..911e6d0fc 100644 --- a/src/main/java/emu/grasscutter/server/event/internal/ServerLogEvent.java +++ b/src/main/java/emu/grasscutter/server/event/internal/ServerLogEvent.java @@ -1,22 +1,24 @@ package emu.grasscutter.server.event.internal; import ch.qos.logback.classic.spi.ILoggingEvent; -import ch.qos.logback.core.AppenderBase; import emu.grasscutter.server.event.types.ServerEvent; -public class ServerLogEvent extends ServerEvent { - ILoggingEvent loggingEvent; - String consoleMessage; +public final class ServerLogEvent extends ServerEvent { + private final ILoggingEvent loggingEvent; + 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.consoleMessage = consoleMessage; } - public ILoggingEvent getLoggingEvent() { return loggingEvent; } + public ILoggingEvent getLoggingEvent() { + return this.loggingEvent; + } public String getConsoleMessage() { - return consoleMessage; + return this.consoleMessage; } } diff --git a/src/main/java/emu/grasscutter/utils/ServerLogEventAppender.java b/src/main/java/emu/grasscutter/utils/ServerLogEventAppender.java index a64ecd5ad..f528b3e96 100644 --- a/src/main/java/emu/grasscutter/utils/ServerLogEventAppender.java +++ b/src/main/java/emu/grasscutter/utils/ServerLogEventAppender.java @@ -17,12 +17,12 @@ public class ServerLogEventAppender extends AppenderBase { @Override protected void append(E 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(); } public Encoder getEncoder() { - return encoder; + return this.encoder; } public void setEncoder(Encoder encoder) {