From dd9a6dfd888954a174fd95432c72d585fac74ca5 Mon Sep 17 00:00:00 2001
From: Tyler Murphy <tylerm@tylerm.dev>
Date: Fri, 28 Jul 2023 18:21:37 -0400
Subject: 1.7.5 rc1

---
 .../java/net/tylermurphy/hideAndSeek/database/GameDataTable.java   | 7 ++-----
 .../hideAndSeek/database/connections/MySQLConnection.java          | 1 -
 .../hideAndSeek/database/connections/SQLiteConnection.java         | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/main/java/net/tylermurphy/hideAndSeek/database')

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/GameDataTable.java b/src/main/java/net/tylermurphy/hideAndSeek/database/GameDataTable.java
index 87378f9..d5fe7e6 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/GameDataTable.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/database/GameDataTable.java
@@ -79,7 +79,6 @@ public class GameDataTable {
                         rs.getInt("seeker_deaths")
                 );
                 rs.close();
-                connection.close();
                 CACHE.put(uuid, info);
                 return info;
             }
@@ -111,7 +110,6 @@ public class GameDataTable {
                         rs.getInt("seeker_deaths")
                 );
                 rs.close();
-                connection.close();
                 CACHE.put(uuid, info);
                 return info;
             }
@@ -145,7 +143,6 @@ public class GameDataTable {
                 infoList.add(info);
             }
             rs.close();
-            connection.close();
             return infoList;
         } catch (SQLException e) {
             Main.getInstance().getLogger().severe("SQL Error: " + e.getMessage());
@@ -190,8 +187,8 @@ public class GameDataTable {
                     database.encodeUUID(info.getUniqueId()),
                     info.getHiderWins() + (winners.contains(uuid) && type == WinType.HIDER_WIN ? 1 : 0),
                     info.getSeekerWins() + (winners.contains(uuid) && type == WinType.SEEKER_WIN ? 1 : 0),
-                    info.getHiderGames() + (board.isHider(uuid) || (board.isSeeker(uuid) && !board.getFirstSeeker().getUniqueId().equals(uuid)) ? 1 : 0),
-                    info.getSeekerGames() + (board.getFirstSeeker().getUniqueId().equals(uuid) ? 1 : 0),
+                    info.getHiderGames() + (board.isHider(uuid) || (board.isSeeker(uuid) && winners.contains(uuid)) ? 1 : 0),
+                    info.getSeekerGames() + (board.isSeeker(uuid) && winners.contains(uuid) ? 1 : 0),
                     info.getHiderKills() + hider_kills.getOrDefault(uuid, 0),
                     info.getSeekerKills() + seeker_kills.getOrDefault(uuid, 0),
                     info.getHiderDeaths() + hider_deaths.getOrDefault(uuid, 0),
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/connections/MySQLConnection.java b/src/main/java/net/tylermurphy/hideAndSeek/database/connections/MySQLConnection.java
index e237e71..20e7c8e 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/connections/MySQLConnection.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/database/connections/MySQLConnection.java
@@ -25,7 +25,6 @@ import net.tylermurphy.hideAndSeek.Main;
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.sql.Statement;
 
 import static net.tylermurphy.hideAndSeek.configuration.Config.*;
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/connections/SQLiteConnection.java b/src/main/java/net/tylermurphy/hideAndSeek/database/connections/SQLiteConnection.java
index 1a03106..bbf330b 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/connections/SQLiteConnection.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/database/connections/SQLiteConnection.java
@@ -52,7 +52,7 @@ public class SQLiteConnection implements DatabaseConnection {
     public Connection connect() {
         Connection conn = null;
         try {
-            String url = "jdbc:sqlite:"+databaseFile;
+            String url = "jdbc:sqlite:"+databaseFile.getPath();
             conn = DriverManager.getConnection(url, config.toProperties());
         } catch (SQLException e) {
             Main.getInstance().getLogger().severe(e.getMessage());
-- 
cgit v1.2.3-freya