Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor chat logging

Browse Source
This commit is contained in:
P0nk
2022-01-03 18:35:15 +01:00
parent 7e7c2cb153
commit 6041d56bcd
9 changed files with 51 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/net/server/channel/handlers/AdminChatHandler.java
View File

@@ -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);
}
}
}
}

11
src/main/java/net/server/channel/handlers/GeneralChatHandler.java
View File

@@ -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);

19
src/main/java/net/server/channel/handlers/MultiChatHandler.java
View File

@@ -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);

7
src/main/java/net/server/channel/handlers/PetChatHandler.java
View File

@@ -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);
}
}

7
src/main/java/net/server/channel/handlers/SpouseChatHandler.java
View File

@@ -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.");
}

7
src/main/java/net/server/channel/handlers/WhisperHandler.java
View File

@@ -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));