diff --git a/src/main/java/net/server/channel/handlers/AdminChatHandler.java b/src/main/java/net/server/channel/handlers/AdminChatHandler.java
index 44a1de029a..4d4dd8db7b 100644
--- a/src/main/java/net/server/channel/handlers/AdminChatHandler.java
+++ b/src/main/java/net/server/channel/handlers/AdminChatHandler.java
@@ -1,11 +1,10 @@
package net.server.channel.handlers;
import client.Client;
-import config.YamlConfig;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.packet.Packet;
-import tools.LogHelper;
+import server.ChatLogger;
import tools.PacketCreator;
/**
@@ -25,23 +24,16 @@ public class AdminChatHandler extends AbstractPacketHandler {
switch (mode) {
case 0:// /alertall, /noticeall, /slideall
c.getWorldServer().broadcastPacket(packet);
- if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) {
- LogHelper.logChat(c, "Alert All", message);
- }
- break;
- case 1:// /alertch, /noticech, /slidech
+ ChatLogger.log(c, "Alert All", message);
+ }
+ case 1 -> {// /alertch, /noticech, /slidech
c.getChannelServer().broadcastPacket(packet);
- if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) {
- LogHelper.logChat(c, "Alert Ch", message);
- }
- break;
- case 2:// /alertm /alertmap, /noticem /noticemap, /slidem /slidemap
+ ChatLogger.log(c, "Alert Ch", message);
+ }
+ case 2 -> {// /alertm /alertmap, /noticem /noticemap, /slidem /slidemap
c.getPlayer().getMap().broadcastMessage(packet);
- if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) {
- LogHelper.logChat(c, "Alert Map", message);
- }
- break;
-
+ ChatLogger.log(c, "Alert Map", message);
+ }
}
}
}
diff --git a/src/main/java/net/server/channel/handlers/GeneralChatHandler.java b/src/main/java/net/server/channel/handlers/GeneralChatHandler.java
index 633327057d..f5b57dadd8 100644
--- a/src/main/java/net/server/channel/handlers/GeneralChatHandler.java
+++ b/src/main/java/net/server/channel/handlers/GeneralChatHandler.java
@@ -25,11 +25,10 @@ import client.Character;
import client.Client;
import client.autoban.AutobanFactory;
import client.command.CommandsExecutor;
-import config.YamlConfig;
import net.AbstractPacketHandler;
import net.packet.InPacket;
+import server.ChatLogger;
import tools.FilePrinter;
-import tools.LogHelper;
import tools.PacketCreator;
public final class GeneralChatHandler extends AbstractPacketHandler {
@@ -59,14 +58,10 @@ public final class GeneralChatHandler extends AbstractPacketHandler {
if (!chr.isHidden()) {
chr.getMap().broadcastMessage(PacketCreator.getChatText(chr.getId(), s, chr.getWhiteChat(), show));
- if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) {
- LogHelper.logChat(c, "General", s);
- }
+ ChatLogger.log(c, "General", s);
} else {
chr.getMap().broadcastGMMessage(PacketCreator.getChatText(chr.getId(), s, chr.getWhiteChat(), show));
- if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) {
- LogHelper.logChat(c, "GM General", s);
- }
+ ChatLogger.log(c, "GM General", s);
}
chr.getAutobanManager().spam(7);
diff --git a/src/main/java/net/server/channel/handlers/MultiChatHandler.java b/src/main/java/net/server/channel/handlers/MultiChatHandler.java
index ea02341b70..8746b79a54 100644
--- a/src/main/java/net/server/channel/handlers/MultiChatHandler.java
+++ b/src/main/java/net/server/channel/handlers/MultiChatHandler.java
@@ -24,13 +24,12 @@ package net.server.channel.handlers;
import client.Character;
import client.Client;
import client.autoban.AutobanFactory;
-import config.YamlConfig;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
import net.server.world.World;
+import server.ChatLogger;
import tools.FilePrinter;
-import tools.LogHelper;
import tools.PacketCreator;
public final class MultiChatHandler extends AbstractPacketHandler {
@@ -57,26 +56,18 @@ public final class MultiChatHandler extends AbstractPacketHandler {
World world = c.getWorldServer();
if (type == 0) {
world.buddyChat(recipients, player.getId(), player.getName(), chattext);
- if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) {
- LogHelper.logChat(c, "Buddy", chattext);
- }
+ ChatLogger.log(c, "Buddy", chattext);
} else if (type == 1 && player.getParty() != null) {
world.partyChat(player.getParty(), chattext, player.getName());
- if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) {
- LogHelper.logChat(c, "Party", chattext);
- }
+ ChatLogger.log(c, "Party", chattext);
} else if (type == 2 && player.getGuildId() > 0) {
Server.getInstance().guildChat(player.getGuildId(), player.getName(), player.getId(), chattext);
- if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) {
- LogHelper.logChat(c, "Guild", chattext);
- }
+ ChatLogger.log(c, "Guild", chattext);
} else if (type == 3 && player.getGuild() != null) {
int allianceId = player.getGuild().getAllianceId();
if (allianceId > 0) {
Server.getInstance().allianceMessage(allianceId, PacketCreator.multiChat(player.getName(), chattext, 3), player.getId(), -1);
- if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) {
- LogHelper.logChat(c, "Ally", chattext);
- }
+ ChatLogger.log(c, "Ally", chattext);
}
}
player.getAutobanManager().spam(7);
diff --git a/src/main/java/net/server/channel/handlers/PetChatHandler.java b/src/main/java/net/server/channel/handlers/PetChatHandler.java
index 7173179ad9..458afdb406 100644
--- a/src/main/java/net/server/channel/handlers/PetChatHandler.java
+++ b/src/main/java/net/server/channel/handlers/PetChatHandler.java
@@ -23,11 +23,10 @@ package net.server.channel.handlers;
import client.Client;
import client.autoban.AutobanFactory;
-import config.YamlConfig;
import net.AbstractPacketHandler;
import net.packet.InPacket;
+import server.ChatLogger;
import tools.FilePrinter;
-import tools.LogHelper;
import tools.PacketCreator;
public final class PetChatHandler extends AbstractPacketHandler {
@@ -50,8 +49,6 @@ public final class PetChatHandler extends AbstractPacketHandler {
return;
}
c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.petChat(c.getPlayer().getId(), pet, act, text), true);
- if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) {
- LogHelper.logChat(c, "Pet", text);
- }
+ ChatLogger.log(c, "Pet", text);
}
}
diff --git a/src/main/java/net/server/channel/handlers/SpouseChatHandler.java b/src/main/java/net/server/channel/handlers/SpouseChatHandler.java
index 7b43153354..c5c406e3a1 100644
--- a/src/main/java/net/server/channel/handlers/SpouseChatHandler.java
+++ b/src/main/java/net/server/channel/handlers/SpouseChatHandler.java
@@ -23,10 +23,9 @@ package net.server.channel.handlers;
import client.Character;
import client.Client;
-import config.YamlConfig;
import net.AbstractPacketHandler;
import net.packet.InPacket;
-import tools.LogHelper;
+import server.ChatLogger;
import tools.PacketCreator;
public final class SpouseChatHandler extends AbstractPacketHandler {
@@ -41,9 +40,7 @@ public final class SpouseChatHandler extends AbstractPacketHandler {
if (spouse != null) {
spouse.sendPacket(PacketCreator.OnCoupleMessage(c.getPlayer().getName(), msg, true));
c.sendPacket(PacketCreator.OnCoupleMessage(c.getPlayer().getName(), msg, true));
- if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) {
- LogHelper.logChat(c, "Spouse", msg);
- }
+ ChatLogger.log(c, "Spouse", msg);
} else {
c.getPlayer().dropMessage(5, "Your spouse is currently offline.");
}
diff --git a/src/main/java/net/server/channel/handlers/WhisperHandler.java b/src/main/java/net/server/channel/handlers/WhisperHandler.java
index 850bfaa286..4332fd5431 100644
--- a/src/main/java/net/server/channel/handlers/WhisperHandler.java
+++ b/src/main/java/net/server/channel/handlers/WhisperHandler.java
@@ -24,11 +24,10 @@ package net.server.channel.handlers;
import client.Character;
import client.Client;
import client.autoban.AutobanFactory;
-import config.YamlConfig;
import net.AbstractPacketHandler;
import net.packet.InPacket;
+import server.ChatLogger;
import tools.FilePrinter;
-import tools.LogHelper;
import tools.PacketCreator;
import tools.PacketCreator.WhisperFlag;
@@ -99,9 +98,7 @@ public final class WhisperHandler extends AbstractPacketHandler {
return;
}
- if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) {
- LogHelper.logChat(user.getClient(), "Whisper To " + target.getName(), message);
- }
+ ChatLogger.log(user.getClient(), "Whisper To " + target.getName(), message);
target.sendPacket(PacketCreator.getWhisperReceive(user.getName(), user.getClient().getChannel() - 1, user.isGM(), message));
diff --git a/src/main/java/server/ChatLogger.java b/src/main/java/server/ChatLogger.java
new file mode 100644
index 0000000000..dd64fe8e3b
--- /dev/null
+++ b/src/main/java/server/ChatLogger.java
@@ -0,0 +1,19 @@
+package server;
+
+import client.Client;
+import config.YamlConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ChatLogger {
+ private static final Logger log = LoggerFactory.getLogger(ChatLogger.class);
+
+ /**
+ * Log a chat message (if enabled in the config)
+ */
+ public static void log(Client c, String chatType, String message) {
+ if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) {
+ log.info("({}) {}: {}", chatType, c.getPlayer().getName(), message);
+ }
+ }
+}
diff --git a/src/main/java/tools/LogHelper.java b/src/main/java/tools/LogHelper.java
index f63960bbf8..89283d8e5b 100644
--- a/src/main/java/tools/LogHelper.java
+++ b/src/main/java/tools/LogHelper.java
@@ -1,11 +1,9 @@
package tools;
import client.Character;
-import client.Client;
import server.ItemInformationProvider;
import java.text.SimpleDateFormat;
-import java.util.Calendar;
import java.util.Date;
import static java.util.concurrent.TimeUnit.MINUTES;
@@ -32,10 +30,4 @@ public class LogHelper {
String log = player.getName() + " got a " + itemName + "(" + itemid + ") from the " + map + " gachapon. - " + timeStamp;
FilePrinter.print(FilePrinter.LOG_GACHAPON, log);
}
-
- public static void logChat(Client player, String chatType, String text) {
- SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy HH:mm");
- FilePrinter.print(FilePrinter.LOG_CHAT, "[" + sdf.format(Calendar.getInstance().getTime()) + "] (" + chatType + ") " + player.getPlayer().getName() + ": " + text);
- }
-
}
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index ecb187e65e..240546a97c 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -48,6 +48,12 @@
${standard-pattern}
+
+
+
+ ${standard-pattern}
+
+
@@ -70,6 +76,9 @@
+
+
+