diff --git a/src/main/java/me/theclashfruit/crss/listener/ChatListener.java b/src/main/java/me/theclashfruit/crss/listener/ChatListener.java
index 07b490e..393ea5f 100644
--- a/src/main/java/me/theclashfruit/crss/listener/ChatListener.java
+++ b/src/main/java/me/theclashfruit/crss/listener/ChatListener.java
@@ -10,9 +10,11 @@ import me.theclashfruit.crss.models.SystemMessage;
 import org.bukkit.ChatColor;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.PlayerChatEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.server.ServerCommandEvent;
 
 public class ChatListener implements Listener {
     private final ChatSocket chatSocket;
@@ -66,4 +68,40 @@ public class ChatListener implements Listener {
 
         chatSocket.broadcast(chatMessage);
     }
+    
+    @EventHandler
+    public void onDeath(PlayerDeathEvent event) {
+        Gson gson = new Gson();
+
+        String chatMessage = gson.toJson(new SystemMessage(
+            "playerDeath",
+            new SystemData(
+                event.getDeathMessage(),
+                0xFFFFFF
+            )
+        ));
+
+        chatSocket.broadcast(chatMessage);
+    }
+    
+    @EventHandler
+    public void onServerCommand(ServerCommandEvent event) {
+        switch (event.getCommand().substring(0, 3)) {
+            case "say":
+                Gson gson = new Gson();
+
+                String chatMessage = gson.toJson(new SystemMessage(
+                    "serverSay",
+                    new SystemData(
+                        ChatColor.stripColor(event.getCommand().substring(4)),
+                        0xAA00AA
+                    )
+                ));
+
+                chatSocket.broadcast(chatMessage);
+                break;
+            default:
+                break;
+        }
+    }
 }