diff --git a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/SaneEconomy.java b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/SaneEconomy.java
index 242d1b3..9693935 100644
--- a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/SaneEconomy.java
+++ b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/SaneEconomy.java
@@ -81,6 +81,9 @@ public class SaneEconomy extends SanePlugin implements ISaneEconomy {
economyManager.getBackend().waitUntilFlushed();
if (economyManager.getBackend() instanceof EconomyStorageBackendMySQL) {
((EconomyStorageBackendMySQL) economyManager.getBackend()).closeConnections();
+ if (((EconomyStorageBackendMySQL) economyManager.getBackend()).getConnection().getConnection().isFinished()) {
+ this.getLogger().warning("SaneDatabase didn't terminate all threads, something weird is going on?");
+ }
}
}
}
diff --git a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/backend/type/EconomyStorageBackendMySQL.java b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/backend/type/EconomyStorageBackendMySQL.java
index ec6233d..ab860e3 100644
--- a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/backend/type/EconomyStorageBackendMySQL.java
+++ b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/backend/type/EconomyStorageBackendMySQL.java
@@ -75,7 +75,7 @@ public class EconomyStorageBackendMySQL extends EconomyStorageBackendCaching {
@Override
public synchronized void reloadDatabase() {
- // waitUntilFlushed();
+ waitUntilFlushed();
createTables();
try (Connection conn = dbConn.openConnection()) {
PreparedStatement ps = dbConn.prepareStatement(conn, String.format("SELECT * FROM `%s`", dbConn.getTable("saneeconomy_balances")));
diff --git a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/utils/database/MySQLConnection.java b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/utils/database/MySQLConnection.java
index 16773af..fb7bc36 100644
--- a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/utils/database/MySQLConnection.java
+++ b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/utils/database/MySQLConnection.java
@@ -78,7 +78,7 @@ public class MySQLConnection {
public void waitUntilFlushed() {
long startTime = System.currentTimeMillis();
- while (!this.saneDatabase.isFinished()) {
+ while (!this.saneDatabase.areAllTransactionsDone()) {
if ((System.currentTimeMillis() - startTime) > 5000) {
LOGGER.warning("Took too long to flush all transactions - something has probably hung :(");
break;
diff --git a/SaneEconomyMobKills/pom.xml b/SaneEconomyMobKills/pom.xml
index 173bde0..41d3d3c 100644
--- a/SaneEconomyMobKills/pom.xml
+++ b/SaneEconomyMobKills/pom.xml
@@ -10,7 +10,7 @@
4.0.0
SaneEconomyMobKills
- 0.1.0-SNAPSHOT
+ 0.1.1-SNAPSHOT
@@ -37,6 +37,32 @@
1.8
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.0.0
+
+
+ package
+
+ shade
+
+
+
+
+ org.appledash:sanelib
+
+
+
+
+ org.appledash.sanelib
+ org.appledash.saneeconomymobkills.shaded.sanelib
+
+
+
+
+
+
org.apache.maven.plugins
maven-jar-plugin
diff --git a/SaneEconomyMobKills/src/main/java/org/appledash/saneeconomymobkills/SaneEconomyMobKills.java b/SaneEconomyMobKills/src/main/java/org/appledash/saneeconomymobkills/SaneEconomyMobKills.java
index 43eaf06..a7cbc59 100644
--- a/SaneEconomyMobKills/src/main/java/org/appledash/saneeconomymobkills/SaneEconomyMobKills.java
+++ b/SaneEconomyMobKills/src/main/java/org/appledash/saneeconomymobkills/SaneEconomyMobKills.java
@@ -43,7 +43,6 @@ public class SaneEconomyMobKills extends SanePlugin {
}
getServer().getPluginManager().registerEvents(new EntityDamageListener(this), this);
- this.getI18n().loadTranslations();
}
public SaneEconomy getSaneEconomy() {
diff --git a/SaneEconomyMobKills/src/main/resources/plugin.yml b/SaneEconomyMobKills/src/main/resources/plugin.yml
index a64ae07..f2682ce 100644
--- a/SaneEconomyMobKills/src/main/resources/plugin.yml
+++ b/SaneEconomyMobKills/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
name: SaneEconomyMobKills
description: A plugin to give players experience when they kill mobs.
-version: 0.1.0
+version: 0.1.1
author: AppleDash
main: org.appledash.saneeconomymobkills.SaneEconomyMobKills
depend: [SaneEconomy]
diff --git a/SaneEconomySignShop/pom.xml b/SaneEconomySignShop/pom.xml
index bee6948..3556ad0 100644
--- a/SaneEconomySignShop/pom.xml
+++ b/SaneEconomySignShop/pom.xml
@@ -37,6 +37,32 @@
1.8
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.0.0
+
+
+ package
+
+ shade
+
+
+
+
+ org.appledash:sanelib
+
+
+
+
+ org.appledash.sanelib
+ org.appledash.saneeconomysignshop.shaded.sanelib
+
+
+
+
+
+
org.apache.maven.plugins
maven-jar-plugin
diff --git a/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/SaneEconomySignShop.java b/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/SaneEconomySignShop.java
index 2113b72..f377265 100644
--- a/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/SaneEconomySignShop.java
+++ b/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/SaneEconomySignShop.java
@@ -51,7 +51,6 @@ public class SaneEconomySignShop extends SanePlugin {
getServer().getPluginManager().registerEvents(new SignChangeListener(this), this);
getServer().getPluginManager().registerEvents(new InteractListener(this), this);
getServer().getPluginManager().registerEvents(new BreakListener(this), this);
- this.getI18n().loadTranslations();
}
public SignShopManager getSignShopManager() {
diff --git a/pom.xml b/pom.xml
index d4c882a..f18e187 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
org.appledash
sanelib
- 0.2.0-SNAPSHOT
+ 0.2.6-SNAPSHOT