From 00349aecaefc1ddeb6b84ecd564e0fe33bb39c7b Mon Sep 17 00:00:00 2001
From: 502647092 <jtb1@163.com>
Date: Fri, 18 Dec 2015 08:51:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AC=E5=9C=B0=E5=8C=96?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E8=BD=BD=E5=85=A5=E4=B8=BA=E5=BC=82=E6=AD=A5?=
 =?UTF-8?q?=20=E5=A6=88=E5=A6=88=E5=86=8D=E4=B9=9F=E4=B8=8D=E6=8B=85?=
 =?UTF-8?q?=E5=BF=83=E5=8D=A1=E6=9C=8D=E5=95=A6=E3=80=82=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                               |  5 +++--
 .../org/maxgamer/QuickShop/Economy/Economy_Vault.java | 11 +++++++----
 src/main/java/org/maxgamer/QuickShop/QuickShop.java   |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2aa514c..32f4d9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.maxgamer</groupId>
 	<artifactId>QuickShop</artifactId>
-	<version>1.6.5</version>
+	<version>1.6.6</version>
 	<description>快捷商店重置版本...</description>
 	<build>
 		<finalName>${project.name}</finalName>
@@ -54,7 +54,8 @@
 	</build>
 	<properties>
 		<jenkins.url>http://ci.citycraft.cn:8080</jenkins.url>
-		<update.description>&amp;c修复超级工具修改无法保存数据的问题...</update.description>
+		<env.BUILD_NUMBER>DEBUG</env.BUILD_NUMBER>
+		<update.description>&amp;c修改本地化工具载入为异步(&amp;a妈妈再也不担心卡服啦&amp;c)...</update.description>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<repositories>
diff --git a/src/main/java/org/maxgamer/QuickShop/Economy/Economy_Vault.java b/src/main/java/org/maxgamer/QuickShop/Economy/Economy_Vault.java
index a4cf1b2..cde6244 100644
--- a/src/main/java/org/maxgamer/QuickShop/Economy/Economy_Vault.java
+++ b/src/main/java/org/maxgamer/QuickShop/Economy/Economy_Vault.java
@@ -104,10 +104,13 @@ public class Economy_Vault implements EconomyCore {
 	}
 
 	private boolean setupEconomy() {
-		final RegisteredServiceProvider<Economy> economyProvider = Bukkit.getServicesManager().getRegistration(Economy.class);
-		if (economyProvider != null) {
-			this.vault = (economyProvider.getProvider());
+		try {
+			final RegisteredServiceProvider<Economy> economyProvider = Bukkit.getServicesManager().getRegistration(Economy.class);
+			if (economyProvider != null) {
+				vault = (economyProvider.getProvider());
+			}
+		} catch (final Exception e) {
 		}
-		return this.vault != null;
+		return vault != null;
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/org/maxgamer/QuickShop/QuickShop.java b/src/main/java/org/maxgamer/QuickShop/QuickShop.java
index 722b03d..37bacf3 100644
--- a/src/main/java/org/maxgamer/QuickShop/QuickShop.java
+++ b/src/main/java/org/maxgamer/QuickShop/QuickShop.java
@@ -196,6 +196,7 @@ public class QuickShop extends JavaPlugin {
 		if (loadEcon() == false) {
 			return;
 		}
+		LocalUtil.init(this);
 		// Initialize Util
 		Util.initialize();
 		// Create the shop manager.
@@ -339,7 +340,6 @@ public class QuickShop extends JavaPlugin {
 	@Override
 	public void onLoad() {
 		config = new FileConfig(this);
-		LocalUtil.reload();
 		MsgUtil.init(this);
 	}
 
@@ -347,6 +347,6 @@ public class QuickShop extends JavaPlugin {
 	@Override
 	public void reloadConfig() {
 		config.reload();
-		LocalUtil.reload();
+		LocalUtil.reload(this);
 	}
 }
\ No newline at end of file