From b73d1df350774186cac0e4f423afcc13ab8f1238 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Tue, 4 Aug 2020 15:05:43 -0500
Subject: [PATCH] baddev

---
 .../totalfreedommod/discord/Discord.java         | 16 +++++++++++++++-
 .../totalfreedom/totalfreedommod/sql/SQLite.java |  1 -
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java b/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
index 26ac92d1..e39dcd95 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
@@ -44,6 +44,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 
 public class Discord extends FreedomService
 {
@@ -272,6 +274,18 @@ public class Discord extends FreedomService
         startBot();
     }
 
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPlayerJoin(PlayerJoinEvent event)
+    {
+        messageChatChannel("**" + deformat(event.getPlayer().getName()) + " joined the server" + "**");
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPlayerLeave(PlayerQuitEvent event)
+    {
+        messageChatChannel("**" + deformat(event.getPlayer().getName()) + " left the server" + "**");
+    }
+
     public void messageChatChannel(String message)
     {
         String chat_channel_id = ConfigEntry.DISCORD_CHAT_CHANNEL_ID.getString();
@@ -378,7 +392,7 @@ public class Discord extends FreedomService
         Guild server = bot.getGuildById(ConfigEntry.DISCORD_SERVER_ID.getString());
         if (server == null)
         {
-            FLog.severe("The discord server ID specified is invalid, or the bot is not on the server.");
+            FLog.severe("The Discord server ID specified is invalid, or the bot is not on the server.");
             return false;
         }
 
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java b/src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java
index acbcbaf1..36268312 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java
@@ -35,7 +35,6 @@ public class SQLite extends FreedomService
 
     public void connect()
     {
-
         try
         {
             connection = DriverManager.getConnection("jdbc:sqlite:" + plugin.getDataFolder() + "/" + FILE_NAME);