diff --git a/app/src/main/java/net/xuyezo/main/Handler.java b/app/src/main/java/net/xuyezo/main/Handler.java
index 34daf57..48fa3d0 100644
--- a/app/src/main/java/net/xuyezo/main/Handler.java
+++ b/app/src/main/java/net/xuyezo/main/Handler.java
@@ -6,6 +6,8 @@ import java.sql.SQLException;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 
 import io.papermc.paper.event.player.AsyncChatEvent;
 import net.kyori.adventure.text.TextComponent;
@@ -40,4 +42,33 @@ public class Handler implements Listener {
 		}
     }
 	
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+    	PreparedStatement stmt;
+		try {
+			stmt = cc.prepareStatement("INSERT INTO main.text (username, date, content) values (?, ?, ?)");
+			stmt.setString(1, ":system");
+		    stmt.setLong(2,  System.currentTimeMillis());
+		    stmt.setString(3, event.getPlayer().getName().concat(" joined the server"));
+	    	stmt.executeUpdate();
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+    }
+    //TODO: rewrite this Junk
+    @EventHandler
+    public void onPlayerLeave(PlayerQuitEvent event) {
+    	PreparedStatement stmt;
+		try {
+			stmt = cc.prepareStatement("INSERT INTO main.text (username, date, content) values (?, ?, ?)");
+			stmt.setString(1, ":system");
+		    stmt.setLong(2,  System.currentTimeMillis());
+		    stmt.setString(3, event.getPlayer().getName().concat(" left the server"));
+	    	stmt.executeUpdate();
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+    }
 }