diff --git a/core/src/main/java/com/xujiayao/discord_mc_chat/network/packets/events/MinecraftEventPacket.java b/core/src/main/java/com/xujiayao/discord_mc_chat/network/packets/events/MinecraftEventPacket.java
index f5a6ab08..2b867f00 100644
--- a/core/src/main/java/com/xujiayao/discord_mc_chat/network/packets/events/MinecraftEventPacket.java
+++ b/core/src/main/java/com/xujiayao/discord_mc_chat/network/packets/events/MinecraftEventPacket.java
@@ -27,7 +27,6 @@ public class MinecraftEventPacket extends Packet {
 		// Server events
 		SERVER_STARTED,
 		SERVER_STOPPING,
-		SERVER_STOPPED,
 
 		// Player events
 		PLAYER_JOIN,
@@ -37,8 +36,8 @@ public class MinecraftEventPacket extends Packet {
 		PLAYER_DIE,
 		PLAYER_ADVANCEMENT,
 
-		// Source events
-		SOURCE_SAY,
-		SOURCE_TELL_RAW
+		// Player & Source events
+		CHAT,
+		ME
 	}
 }
diff --git a/core/src/main/java/com/xujiayao/discord_mc_chat/server/ServerHandler.java b/core/src/main/java/com/xujiayao/discord_mc_chat/server/ServerHandler.java
index 7e4b41ff..c56a6ed7 100644
--- a/core/src/main/java/com/xujiayao/discord_mc_chat/server/ServerHandler.java
+++ b/core/src/main/java/com/xujiayao/discord_mc_chat/server/ServerHandler.java
@@ -107,8 +107,6 @@ public class ServerHandler extends SimpleChannelInboundHandler<Packet> {
 						case PLAYER_ADVANCEMENT ->
 								DiscordManager.clientBroadcast(clientName, "player.advancement", "player.advancement." + p.placeholders.get("type"), false, p.placeholders);
 						// TODO Unhandled events
-						default ->
-								LOGGER.warn("Received MinecraftEventPacket from authenticated client {}: type={}, placeholders={}", clientName, p.type, p.placeholders);
 					}
 				}
 				case InfoResponsePacket p -> NetworkManager.cacheInfoResponse(clientName, p);
diff --git a/core/src/main/resources/config/config_single_server.yml b/core/src/main/resources/config/config_single_server.yml
index 67c43793..64e473ab 100644
--- a/core/src/main/resources/config/config_single_server.yml
+++ b/core/src/main/resources/config/config_single_server.yml
@@ -55,6 +55,8 @@ broadcasts:
     source:
       say: "in-game-chat"
       tell_raw: "in-game-chat"
+      msg: "in-game-chat" # msg / tell / w
+      me: "in-game-chat"
 
 # 消息格式设置
 message_parsing:
@@ -83,8 +85,8 @@ message_parsing:
 excluded_commands:
   - "/msg (?!@a)(.*)"
   - "/tell (?!@a)(.*)"
-  - "/tellraw (?!@a)(.*)"
   - "/w (?!@a)(.*)"
+  - "/tellraw (?!@a)(.*)"
   - "/teammsg (.*)"
   - "/tm (.*)"
   - "/login (.*)"
diff --git a/core/src/main/resources/config/config_standalone.yml b/core/src/main/resources/config/config_standalone.yml
index 898878f7..9a4afdae 100644
--- a/core/src/main/resources/config/config_standalone.yml
+++ b/core/src/main/resources/config/config_standalone.yml
@@ -72,6 +72,8 @@ broadcasts:
     source:
       say: "in-game-chat"
       tell_raw: "in-game-chat"
+      msg: "in-game-chat" # msg / tell / w
+      me: "in-game-chat"
 
 # 消息格式设置
 message_parsing:
@@ -100,8 +102,8 @@ message_parsing:
 excluded_commands:
   - "/msg (?!@a)(.*)"
   - "/tell (?!@a)(.*)"
-  - "/tellraw (?!@a)(.*)"
   - "/w (?!@a)(.*)"
+  - "/tellraw (?!@a)(.*)"
   - "/teammsg (.*)"
   - "/tm (.*)"
   - "/login (.*)"