diff --git a/SaneEconomyCore/pom.xml b/SaneEconomyCore/pom.xml
index 54e8278..e964285 100644
--- a/SaneEconomyCore/pom.xml
+++ b/SaneEconomyCore/pom.xml
@@ -6,10 +6,10 @@
org.appledash
SaneEconomy
- 0.12.3-SNAPSHOT
+ 0.12.4-SNAPSHOT
SaneEconomyCore
- 0.12.3-SNAPSHOT
+ 0.12.4-SNAPSHOT
diff --git a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/SaneEconomy.java b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/SaneEconomy.java
index 7d68c48..4252ddf 100644
--- a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/SaneEconomy.java
+++ b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/SaneEconomy.java
@@ -75,11 +75,15 @@ public class SaneEconomy extends SanePlugin implements ISaneEconomy {
vaultHook.unhook();
}
- if (economyManager != null) {
- getLogger().info("Flushing database...");
- economyManager.getBackend().waitUntilFlushed();
+ this.flushEconomyManager();
+ }
- if (economyManager.getBackend() instanceof EconomyStorageBackendMySQL) {
+ private void flushEconomyManager() {
+ if (this.economyManager != null) {
+ this.getLogger().info("Flushing database...");
+ this.economyManager.getBackend().waitUntilFlushed();
+
+ if (this.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?");
@@ -88,7 +92,7 @@ public class SaneEconomy extends SanePlugin implements ISaneEconomy {
}
}
- private boolean loadConfig() {
+ public boolean loadConfig() {
File configFile = new File(getDataFolder(), "config.yml");
if (configFile.exists() && getConfig().getBoolean("debug", false)) {
@@ -99,10 +103,14 @@ public class SaneEconomy extends SanePlugin implements ISaneEconomy {
getConfig().set("debug", true);
saveConfig();
} else {
- saveDefaultConfig();
- reloadConfig();
+ if (!configFile.exists()) {
+ this.saveDefaultConfig();
+ }
+ this.reloadConfig();
}
+ this.flushEconomyManager(); // If we're reloading the configuration, we flush the old economy manager first
+
SaneEconomyConfiguration config = new SaneEconomyConfiguration(this);
economyManager = config.loadEconomyBackend();
diff --git a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/command/SaneEcoCommand.java b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/command/SaneEcoCommand.java
index be391cd..fce23a4 100644
--- a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/command/SaneEcoCommand.java
+++ b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/command/SaneEcoCommand.java
@@ -26,7 +26,9 @@ public class SaneEcoCommand extends SaneCommand {
@Override
public String[] getUsage() {
return new String[] {
- "/ reload-database"
+ "/ reload - Reload everything.",
+ "/ reload-database - Reload the database.",
+ "/ reload-config - Reload the configuration."
};
}
@@ -42,6 +44,15 @@ public class SaneEcoCommand extends SaneCommand {
this.saneEconomy.getMessenger().sendMessage(sender, "Reloading database...");
saneEconomy.getEconomyManager().getBackend().reloadDatabase();
this.saneEconomy.getMessenger().sendMessage(sender, "Database reloaded.");
+ } else if (subCommand.equalsIgnoreCase("reload-config")) {
+ this.saneEconomy.getMessenger().sendMessage(sender, "Reloading configuration...");
+ this.saneEconomy.loadConfig();
+ this.saneEconomy.getMessenger().sendMessage(sender, "Configuration reloaded.");
+ } else if (subCommand.equalsIgnoreCase("reload")) {
+ this.saneEconomy.getMessenger().sendMessage(sender, "Reloading configuration and database...");
+ this.saneEconomy.loadConfig();
+ this.saneEconomy.getEconomyManager().getBackend().reloadDatabase();
+ this.saneEconomy.getMessenger().sendMessage(sender, "Configuration and database reloaded.");
} else {
throw new InvalidUsageException();
}
diff --git a/SaneEconomyMobKills/pom.xml b/SaneEconomyMobKills/pom.xml
index b53127f..3b21f32 100644
--- a/SaneEconomyMobKills/pom.xml
+++ b/SaneEconomyMobKills/pom.xml
@@ -5,18 +5,18 @@
SaneEconomy
org.appledash
- 0.12.3-SNAPSHOT
+ 0.12.4-SNAPSHOT
4.0.0
SaneEconomyMobKills
- 0.1.2-SNAPSHOT
+ 0.1.3-SNAPSHOT
org.appledash
SaneEconomyCore
- 0.12.3-SNAPSHOT
+ 0.12.4-SNAPSHOT
diff --git a/SaneEconomySignShop/pom.xml b/SaneEconomySignShop/pom.xml
index fea9aa4..ed2ec2e 100644
--- a/SaneEconomySignShop/pom.xml
+++ b/SaneEconomySignShop/pom.xml
@@ -5,7 +5,7 @@
SaneEconomy
org.appledash
- 0.12.3-SNAPSHOT
+ 0.12.4-SNAPSHOT
4.0.0
@@ -16,7 +16,7 @@
org.appledash
SaneEconomyCore
- 0.12.3-SNAPSHOT
+ 0.12.4-SNAPSHOT
diff --git a/SaneEconomySignShop/src/main/resources/config.yml b/SaneEconomySignShop/src/main/resources/config.yml
index a78f5e9..5a921bc 100644
--- a/SaneEconomySignShop/src/main/resources/config.yml
+++ b/SaneEconomySignShop/src/main/resources/config.yml
@@ -1,2 +1,4 @@
admin-shop-trigger: '[Shop]'
admin-shop-title: '&8[&6Shop&8]&r'
+chat:
+ prefix: '&b[&9Shops&b]&r '
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7d36816..f2a663d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
org.appledash
SaneEconomy
- 0.12.3-SNAPSHOT
+ 0.12.4-SNAPSHOT
pom
@@ -46,7 +46,7 @@
org.appledash
sanelib
- 0.3.1-SNAPSHOT
+ 0.3.2-SNAPSHOT