diff --git a/Assembly/dependency-reduced-pom.xml b/Assembly/dependency-reduced-pom.xml index ccd0cfd..647e85b 100644 --- a/Assembly/dependency-reduced-pom.xml +++ b/Assembly/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ AntiVPN dev.brighten.antivpn - 1.4.0 + 1.4.1 4.0.0 Assembly diff --git a/Assembly/pom.xml b/Assembly/pom.xml index 03f5fef..76b9739 100644 --- a/Assembly/pom.xml +++ b/Assembly/pom.xml @@ -5,7 +5,7 @@ AntiVPN dev.brighten.antivpn - 1.4.0 + 1.4.1 4.0.0 diff --git a/Bukkit/dependency-reduced-pom.xml b/Bukkit/dependency-reduced-pom.xml index 3e7b35e..18d1ed9 100644 --- a/Bukkit/dependency-reduced-pom.xml +++ b/Bukkit/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ AntiVPN dev.brighten.antivpn - 1.4.0 + 1.4.1 4.0.0 Bukkit @@ -56,7 +56,7 @@ dev.brighten.antivpn Common - 1.4.0 + 1.4.1 provided diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml index c006c24..b2fcc9b 100644 --- a/Bukkit/pom.xml +++ b/Bukkit/pom.xml @@ -5,7 +5,7 @@ AntiVPN dev.brighten.antivpn - 1.4.0 + 1.4.1 4.0.0 @@ -69,7 +69,7 @@ dev.brighten.antivpn Common - 1.4.0 + 1.4.1 provided diff --git a/Bungee/dependency-reduced-pom.xml b/Bungee/dependency-reduced-pom.xml index 4017f08..b671610 100644 --- a/Bungee/dependency-reduced-pom.xml +++ b/Bungee/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ AntiVPN dev.brighten.antivpn - 1.4.0 + 1.4.1 4.0.0 Bungee @@ -50,7 +50,7 @@ dev.brighten.antivpn Common - 1.4.0 + 1.4.1 provided diff --git a/Bungee/pom.xml b/Bungee/pom.xml index f483674..a35fd25 100644 --- a/Bungee/pom.xml +++ b/Bungee/pom.xml @@ -5,7 +5,7 @@ AntiVPN dev.brighten.antivpn - 1.4.0 + 1.4.1 4.0.0 @@ -63,7 +63,7 @@ dev.brighten.antivpn Common - 1.4.0 + 1.4.1 provided diff --git a/Common/pom.xml b/Common/pom.xml index a8482ee..8821122 100644 --- a/Common/pom.xml +++ b/Common/pom.xml @@ -5,7 +5,7 @@ AntiVPN dev.brighten.antivpn - 1.4.0 + 1.4.1 4.0.0 diff --git a/Common/src/main/java/dev/brighten/antivpn/database/sql/MySqlVPN.java b/Common/src/main/java/dev/brighten/antivpn/database/sql/MySqlVPN.java index bd5278a..e09d142 100644 --- a/Common/src/main/java/dev/brighten/antivpn/database/sql/MySqlVPN.java +++ b/Common/src/main/java/dev/brighten/antivpn/database/sql/MySqlVPN.java @@ -192,6 +192,21 @@ public class MySqlVPN implements VPNDatabase { MySQL.init(); System.out.println("Creating tables..."); + + //Running check for old table types to update + oldTableCheck: { + Query.prepare("select `DATA_TYPE` from INFORMATION_SCHEMA.COLUMNS " + + "WHERE table_name = 'responses' AND COLUMN_NAME = 'isp';").execute(set -> { + if(set.getObject("DATA_TYPE").toString().contains("varchar")) { + System.out.println("Using old database format for storing responses! " + + "Dropping table and creating a new one..."); + if(Query.prepare("drop table `responses`").execute() == 1) { + System.out.println("Sucessfully dropped table!"); + } + } + }); + } + Query.prepare("create table if not exists `whitelisted` (`uuid` varchar(36) not null)").execute(); Query.prepare("create table if not exists `responses` (`ip` varchar(45) not null, `asn` varchar(12)," + "`countryName` text, `countryCode` varchar(10), `city` text, `timeZone` varchar(64), " diff --git a/Common/src/main/java/dev/brighten/antivpn/database/sql/utils/MySQL.java b/Common/src/main/java/dev/brighten/antivpn/database/sql/utils/MySQL.java index 2d06abd..7718312 100644 --- a/Common/src/main/java/dev/brighten/antivpn/database/sql/utils/MySQL.java +++ b/Common/src/main/java/dev/brighten/antivpn/database/sql/utils/MySQL.java @@ -4,6 +4,7 @@ import dev.brighten.antivpn.AntiVPN; import java.sql.Connection; import java.sql.DriverManager; +import java.sql.SQLException; public class MySQL { private static Connection conn; @@ -52,6 +53,11 @@ public class MySQL { if(conn == null) return true; - return conn,isClosed(); + try { + return conn.isClosed(); + } catch (SQLException e) { + e.printStackTrace(); + return true; + } } } diff --git a/pom.xml b/pom.xml index e4810a7..f5db8d3 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ dev.brighten.antivpn AntiVPN pom - 1.4.0 + 1.4.1 Common