From 57a6808516990b6b41993f73d62552fdc9b3711f Mon Sep 17 00:00:00 2001
From: RealizedMC <TheMCman12@gmail.com>
Date: Tue, 5 Feb 2019 08:06:55 -0800
Subject: [PATCH] v3.2.2 - MySQL fix

---
 build.gradle                                  |   4 ++--
 gradle/wrapper/gradle-wrapper.jar             | Bin 54712 -> 54706 bytes
 gradle/wrapper/gradle-wrapper.properties      |   3 ++-
 .../data/database/MySQLDatabase.java          |  20 ++++--------------
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/build.gradle b/build.gradle
index e1695d8..b8c353a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ plugins {
 }
 
 group 'me.realized'
-version '3.2.1'
+version '3.2.2'
 
 project.tasks.assemble.dependsOn project.tasks.shadowJar
 jar.enabled = false
@@ -104,7 +104,7 @@ dependencies {
     compile 'com.zaxxer:HikariCP:2.7.8'
     compile 'org.slf4j:slf4j-nop:1.7.25'
     compile 'org.bstats:bstats-bukkit:1.2'
-    compile 'org.inventivetalent.spiget-update:bukkit:1.4.0'
+    compile 'org.inventivetalent.spiget-update:bukkit:1.4.2-SNAPSHOT'
 }
 
 shadowJar {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index ed88a042a287c140a32e1639edfc91b2a233da8c..44f5f2ab8912045e449200794619374a494accc1 100644
GIT binary patch
delta 673
zcmYL{Ye<t(9LC@Cw`S4i-etx1u27arzA|%$HE*%VE@WFX4YITgv05dQiVO@P5zG&T
z)`MsmM1B(NLq^3Q1I0PrMYlO6iar!XqYHE)>TAb?<@xk`p65J&IQ)-)IPJ-BTF;Kv
zUH;B%m69aY-Ekb&+<5x)GLw3gk>?c?D~23<T=+dvs+S~pb^5Be1AmlEe$fC&;J|VX
z2-LEEqyjcJ3e%*WQWAay*TXxhlEMTYVhZx3GR|sbEg!IS>NGsu1Z}XG?CAm<gS**1
zJPf*63g3e#=#^2_wWe%Q@6VFg{3}aRCmv57BdY}?Q)YNA2H2-nGFwH%ZPlZT%aw&f
zx=PX!pDrd-$&%C|FQl^Ts0kgUjA~&zojSOyjd&eW$>?0NGGPs?R8=RWFT9U(>IFu_
zRZM~*a)fjqSUtJ89Z^{m{E-S8@Zg1K8}th@N}~$pdAT&<q&G)cgWQTVq20F;Z=$>C
zw2xzfNRG}ZG~SH&&0FA@m+^?pzN@&@z8PO;Y}C;rFxaBt_^e8%Rv{Z&*J6}QU7L{Z
zHZxCUY>z3d1~suO^sPe#pJIEN0Y&lil-UhiUp^YTH(+N{#^<;~n!Cc<nkb`ny#gD1
z4I+J(P<Sn#IK_U!Hg|z$?~7?;bLEu#Kwx%qKb;xmXu+*y5zD~KWG(v$!+bsaii`8-
oXlxws#>@EwRR)wT6lN{{ssA5|FVncZP);9kbD=;}8CW#`0--AcNdN!<

delta 771
zcmYk4T}V@57{|~1DD!C3j=K4An#q=?9#JM`8Vz(9v>L*&tgPsZETd1n2)e3K6o{7X
zPe`Rm(Vc-h2<oCV_F-;r>YO)uWmlFLsoiu}?_Q^Q;BcPb@A<#adk*LI4yAk;O6jdj
zU)^i?ZkHtK__M~AjHSXKg=?LwolNRgN4+**swCMZtoimEVtZ00morTsHpW|wJf6#M
zm;)xX`78g=K#%_@>&K$MhK(aPP|ud}x;PIP0~+mQFjpJlWGX&!JgG~dXF^7gPDWNx
zBU{>rIT384f%Faf7_`!I{yI5mp&(J=+{6*;Di-DV#6haDBugDGS+Y?UQczK)==nP)
zui`2m$U}2g7RG`KJYQ8xujZ;mWXo!|W{YZh!vuBGO7|RM?mLGbHzqa8aSCj3mSTBI
z!S3d*%S_G5W+qbR^H3L3$#G1mj?f`ij*-wQN<D+okO}4CdX|j~VHdj%Z`j5L@hg0m
zv<|F<3vs%m1l>~_O<#w7(1iGuo!W1Ta-n@Y?<i=As1&#*R99pldxbBNR(gB~?r1q0
zqYbPG_oL_e28+?F)avHBUFda};#y3>+i8`4KM<<=p$UJdH8OS!ban4Qm?!SesFeS7
zUG?ekd8UyvJe%nBC}PgxS(OT&Z|Wzr2gul$#2imdqdzZ_q({Tc#2Sra{X%69Wb=I$
zEW}i*805+>&@rddl{XwMcr<6FocGYjE%-KPWk0bk-bO29kjHJ}`@M0M`4Nd<ram8r
kedbD+laWC(NU|*R|81AH9@2u1BOsnjaL-rjn*0g)2P)7I!T<mO

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 89626ea..20a8408 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Tue Feb 05 08:05:17 PST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
diff --git a/src/main/java/me/realized/tokenmanager/data/database/MySQLDatabase.java b/src/main/java/me/realized/tokenmanager/data/database/MySQLDatabase.java
index ed86540..84425ff 100644
--- a/src/main/java/me/realized/tokenmanager/data/database/MySQLDatabase.java
+++ b/src/main/java/me/realized/tokenmanager/data/database/MySQLDatabase.java
@@ -386,8 +386,6 @@ private void insertCache(final Connection connection, final Map<UUID, Long> cach
     }
 
     private OptionalLong select(final Connection connection, final String key, final boolean create) throws Exception {
-        connection.setAutoCommit(false);
-
         try (PreparedStatement selectStatement = connection.prepareStatement(Query.SELECT_ONE.query)) {
             selectStatement.setString(1, key);
 
@@ -410,24 +408,14 @@ private OptionalLong select(final Connection connection, final String key, final
 
                 return OptionalLong.of(resultSet.getLong("tokens"));
             }
-        } finally {
-            connection.commit();
         }
     }
 
     private void update(final Connection connection, final String key, final long value) throws Exception {
-        connection.setAutoCommit(false);
-
-        try (PreparedStatement selectStatement = connection.prepareStatement(Query.SELECT_ONE.query)) {
-            selectStatement.setString(1, key);
-
-            try (ResultSet resultSet = selectStatement.executeQuery()) {
-                resultSet.next();
-                resultSet.updateLong("tokens", value);
-                resultSet.updateRow();
-            }
-        } finally {
-            connection.commit();
+        try (PreparedStatement statement = connection.prepareStatement(Query.UPDATE.query)) {
+            statement.setLong(1, value);
+            statement.setString(2, key);
+            statement.execute();
         }
     }