From 6e6ca06baed5ba6255242451299a7c9f3dbeff43 Mon Sep 17 00:00:00 2001
From: Karl Essinger <xkaess22@gmail.com>
Date: Mon, 23 Jul 2018 04:33:53 +0200
Subject: [PATCH] Database things removed for rushed release

---
 .../com/karlofduty/altfinder/AltFinder.java   | 22 --------
 .../eventlisteners/OnPlayerJoin.java          | 50 -------------------
 src/main/resources/config.yml                 | 13 -----
 3 files changed, 85 deletions(-)

diff --git a/src/main/java/com/karlofduty/altfinder/AltFinder.java b/src/main/java/com/karlofduty/altfinder/AltFinder.java
index 211af2f..160d9dc 100644
--- a/src/main/java/com/karlofduty/altfinder/AltFinder.java
+++ b/src/main/java/com/karlofduty/altfinder/AltFinder.java
@@ -2,7 +2,6 @@
 
 import com.karlofduty.altfinder.commands.IPCommand;
 import com.karlofduty.altfinder.commands.MCLeaksCommand;
-import com.karlofduty.altfinder.eventlisteners.MCLeaksAutoCheck;
 import com.karlofduty.altfinder.eventlisteners.OnPlayerJoin;
 import me.gong.mcleaks.MCLeaksAPI;
 import org.bukkit.ChatColor;
@@ -10,7 +9,6 @@
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.sql.SQLException;
 import java.util.concurrent.TimeUnit;
 
 public class AltFinder extends JavaPlugin
@@ -18,9 +16,6 @@ public class AltFinder extends JavaPlugin
     public static FileConfiguration config;
     private static String configVersion = "00001";
 
-    public static Database database = new Database();
-
-
     public final MCLeaksAPI mcLeaksAPI = MCLeaksAPI.builder()
             .threadCount(2)
             .expireAfter(30, TimeUnit.MINUTES).build();
@@ -43,22 +38,6 @@ public void onEnable()
                     "Compatible config version: " + configVersion + "\n");
         }
 
-        //TODO: Add database integration and begin player logging
-        try
-        {
-            database.connect(
-                    config.getString("database.mysql.hostname"),
-                    config.getInt   ("database.mysql.port"),
-                    config.getString("database.mysql.database"),
-                    config.getString("database.mysql.username"),
-                    config.getString("database.mysql.password")
-            );
-        }
-        catch (SQLException e)
-        {
-            e.printStackTrace();
-        }
-
         // Set command executors
         this.getCommand("ip").setExecutor(new IPCommand());
         this.getCommand("mcleaks").setExecutor(new MCLeaksCommand());
@@ -72,7 +51,6 @@ public void onEnable()
     public void onDisable()
     {
         mcLeaksAPI.shutdown();
-        database.disconnect();
     }
 
     public static AltFinder getInstance() {
diff --git a/src/main/java/com/karlofduty/altfinder/eventlisteners/OnPlayerJoin.java b/src/main/java/com/karlofduty/altfinder/eventlisteners/OnPlayerJoin.java
index a2d218d..bb0448c 100644
--- a/src/main/java/com/karlofduty/altfinder/eventlisteners/OnPlayerJoin.java
+++ b/src/main/java/com/karlofduty/altfinder/eventlisteners/OnPlayerJoin.java
@@ -1,69 +1,19 @@
 package com.karlofduty.altfinder.eventlisteners;
 
 import com.karlofduty.altfinder.ConfigValues;
-import com.karlofduty.altfinder.Database;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-
 //TODO: Restructure class after temporary database functionality has been added
 public class OnPlayerJoin implements Listener
 {
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event)
     {
-        logPlayerJoin(event);
         if(ConfigValues.getBool("mcleaks.join-check.enable-join-check"))
         {
             MCLeaksAutoCheck.checkPlayer(event);
         }
     }
-    private void logPlayerJoin(PlayerJoinEvent event)
-    {
-        boolean exists = false;
-        try
-        {
-            String sql = "SELECT * FROM " + Database.uuidTable + " WHERE uuid=?";
-            PreparedStatement stmt = Database.getDB().prepareStatement(sql);
-            stmt.setString(1, event.getPlayer().getUniqueId().toString());
-            ResultSet results = stmt.executeQuery();
-
-            if (!results.next())
-            {
-                System.out.println("Failed");
-            }
-            else
-            {
-                exists = true;
-                System.out.println("Success");
-            }
-        }
-        catch (SQLException e)
-        {
-            e.printStackTrace();
-        }
-
-        if(!exists)
-        {
-            String sql = "INSERT INTO " + Database.uuidTable + "(`uuid`, `latestusername`, `latestip`, `lastseen`) VALUES (?,?,?,?);";
-            try
-            {
-                PreparedStatement stmt = Database.getDB().prepareStatement(sql);
-                stmt.setString(1, event.getPlayer().getUniqueId().toString());
-                stmt.setString(2, event.getPlayer().getName());
-                stmt.setString(3, event.getPlayer().getAddress().getHostName());
-                stmt.setTimestamp(4, new Timestamp(System.currentTimeMillis()));
-                stmt.executeUpdate();
-            }
-            catch (SQLException e)
-            {
-                e.printStackTrace();
-            }
-        }
-    }
 }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index da96e8b..3b2c12f 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -37,15 +37,6 @@
 # Only change this value if you have manually added new config entries and want to remove the console warning
 config-version: "00001"
 
-database:
-  type: "mysql"
-  mysql:
-    hostname: "localhost"
-    port: 3306
-    database: "altfinder"
-    username: "root"
-    password: ""
-
 # Settings related to the anti-mcleaks part of the plugin
 mcleaks:
   join-check:
@@ -73,10 +64,6 @@ mcleaks:
       execute-command: true
       command: "ban <targetplayer> Using a stolen/hacked account."
 
-
-
-
-
 # Settings for command responses
 commands: